diff --git a/ide/src/base-ui/checkbox/LitCheckBox.ts b/ide/src/base-ui/checkbox/LitCheckBox.ts
index dcb5693a84b509be714d83ee8a82442b81b4106c..cacb1cdfb46467ef15272ca0c0262aac71c5b5f0 100644
--- a/ide/src/base-ui/checkbox/LitCheckBox.ts
+++ b/ide/src/base-ui/checkbox/LitCheckBox.ts
@@ -143,15 +143,14 @@ export class LitCheckBox extends BaseElement {
   }
 
   connectedCallback() {
-    this.checkbox!.addEventListener('change', (ev) => {
+    this.checkbox!.addEventListener('change', () => {
       this.checked = this.checkbox!.checked;
-      this.dispatchEvent(
-        new CustomEvent('change', {
-          detail: {
-            checked: this.checked,
-          },
-        })
-      );
+      let changeEvent: CustomEventInit<LitCheckBoxChangeEvent> = {
+        detail: {
+          checked: this.checked,
+        },
+      };
+      this.dispatchEvent(new CustomEvent('change', changeEvent));
     });
   }
 
@@ -165,3 +164,7 @@ export class LitCheckBox extends BaseElement {
     }
   }
 }
+
+export interface LitCheckBoxChangeEvent {
+  checked: boolean;
+}
diff --git a/ide/src/base-ui/select/LitSelect.ts b/ide/src/base-ui/select/LitSelect.ts
index 985f1d01159d8b5177b92d1f4d541f0c081c2546..28d1dded6c73574fe769a0d79efafc5356f86aab 100644
--- a/ide/src/base-ui/select/LitSelect.ts
+++ b/ide/src/base-ui/select/LitSelect.ts
@@ -22,6 +22,7 @@ export class LitSelect extends BaseElement {
   private selectInputEl: any;
   private selectClearEl: any;
   private selectIconEl: any;
+  private bodyEl: any;
   private selectSearchEl: any;
   private selectMultipleRootEl: any;
 
@@ -278,6 +279,7 @@ export class LitSelect extends BaseElement {
   connectedCallback() {
     this.tabIndex = 0;
     this.focused = false;
+    this.bodyEl = this.shadowRoot!.querySelector('.body');
     this.selectInputEl = this.shadowRoot!.querySelector('input');
     this.selectClearEl = this.shadowRoot!.querySelector('.clear');
     this.selectIconEl = this.shadowRoot!.querySelector('.icon');
@@ -313,19 +315,20 @@ export class LitSelect extends BaseElement {
         if (this.focused === false) {
           this.selectInputEl.focus();
           this.focused = true;
+          this.bodyEl!.style.display = 'block';
         } else {
           this.blur();
+          this.bodyEl!.style.display = 'none';
           this.focused = false;
         }
       }
     };
     this.onmouseover = this.onfocus = (ev) => {
       if (this.focused === false && this.hasAttribute('adaptive-expansion')) {
-        let body = this.shadowRoot!.querySelector('.body');
-        if (this.parentElement!.offsetTop < body!.clientHeight) {
-          body!.classList.add('body-bottom');
+        if (this.parentElement!.offsetTop < this.bodyEl!.clientHeight) {
+          this.bodyEl!.classList.add('body-bottom');
         } else {
-          body!.classList.remove('body-bottom');
+          this.bodyEl!.classList.remove('body-bottom');
         }
       }
       if (this.hasAttribute('allow-clear')) {
@@ -487,6 +490,7 @@ export class LitSelect extends BaseElement {
         } else {
           [...this.querySelectorAll('lit-select-option')].forEach((a) => a.removeAttribute('selected'));
           this.blur();
+          this.bodyEl!.style.display = 'none';
           // @ts-ignore
           this.selectInputEl.value = e.detail.text;
         }
diff --git a/ide/src/base-ui/select/LitSelectOption.ts b/ide/src/base-ui/select/LitSelectOption.ts
index 59daef7e233b463a4c6b07dafbe5dcf3bfdd6516..cbade4cd0334b41e4ebadc8810299a15c003b1c6 100644
--- a/ide/src/base-ui/select/LitSelectOption.ts
+++ b/ide/src/base-ui/select/LitSelectOption.ts
@@ -31,7 +31,8 @@ export class LitSelectOption extends BaseElement {
             color: var(--dark-color2,#333);
             tab-index: -1;
             align-items: center;
-            width: 100%;
+            width: max-content;
+            min-width: 100%;
             max-lines: 1;
             white-space: nowrap;
             font-size: 0.8rem;
diff --git a/ide/src/base-ui/switch/lit-switch.ts b/ide/src/base-ui/switch/lit-switch.ts
index 2355109c8ba05ae212c4a0ee1a92fd493515badc..98f214e2c9f75e50949943a3289b20aa5b8947b2 100644
--- a/ide/src/base-ui/switch/lit-switch.ts
+++ b/ide/src/base-ui/switch/lit-switch.ts
@@ -132,17 +132,23 @@ export default class LitSwitch extends BaseElement {
     this.checked = this.checked;
     this.switch!.onchange = (ev) => {
       this.checked = this.switch!.checked;
-      this.dispatchEvent(new CustomEvent('change', { detail: { checked: this.checked } }));
+      let changeEvent: CustomEventInit<LitSwitchChangeEvent> = {
+        detail: {
+          checked: this.checked,
+        },
+      };
+      this.dispatchEvent(new CustomEvent('change', changeEvent));
     };
     this.switch.onkeydown = (ev) => {
       switch (ev.keyCode) {
         case 13: //enter
           this.checked = !this.checked;
-          this.dispatchEvent(
-            new CustomEvent('change', {
-              detail: { checked: this.checked },
-            })
-          );
+          let changeEvent: CustomEventInit<LitSwitchChangeEvent> = {
+            detail: {
+              checked: this.checked,
+            },
+          };
+          this.dispatchEvent(new CustomEvent('change', changeEvent));
           break;
         default:
           break;
@@ -190,3 +196,7 @@ export default class LitSwitch extends BaseElement {
     }
   }
 }
+
+export interface LitSwitchChangeEvent {
+  checked: boolean;
+}
diff --git a/ide/src/command/Cmd.ts b/ide/src/command/Cmd.ts
index b15711fedec3e3311d12a5e8ef9d8e13e545a916..1b7dacac5d82f281a93565a01444bdc57d5414af 100644
--- a/ide/src/command/Cmd.ts
+++ b/ide/src/command/Cmd.ts
@@ -13,6 +13,10 @@
  * limitations under the License.
  */
 
+import { SpRecordTrace } from '../trace/component/SpRecordTrace.js';
+import { CmdConstant } from './CmdConstant.js';
+import { HdcDeviceManager } from '../hdc/HdcDeviceManager.js';
+
 export class Cmd {
   static CmdSendPostUtils(uri: string, callback: Function, requestData: any) {
     // @ts-ignore
@@ -173,4 +177,64 @@ export class Cmd {
     let result = res.ok ? await res.text() : '';
     return result;
   }
+
+  static convertOutProcessList(res: string): string[] {
+    let processData: string[] = [];
+    if (res) {
+      let lineValues: string[] = res.replace(/\r\n/g, '\r').replace(/\n/g, '\r').split(/\r/);
+      for (let lineVal of lineValues) {
+        lineVal = lineVal.trim();
+        if (lineVal.indexOf('__progname') != -1 || lineVal.indexOf('CMD') != -1 || lineVal.length === 0) {
+          continue;
+        } else {
+          let process: string[] = lineVal.split(' ');
+          if (process.length == 2) {
+            processData.push(process[1] + '(' + process[0] + ')');
+          }
+        }
+      }
+    }
+    return processData;
+  }
+  static getDebugProcess(): Promise<string[]> {
+    return new Promise((resolve, reject) => {
+      if (SpRecordTrace.isVscode) {
+        let cmd = Cmd.formatString(CmdConstant.CMD_GET_DEBUG_PROCESS_DEVICES, [SpRecordTrace.serialNumber]);
+        Cmd.execHdcCmd(cmd, (res: string) => {
+          resolve(Cmd.convertOutProcessList(res));
+        });
+      } else {
+        HdcDeviceManager.connect(SpRecordTrace.serialNumber).then((conn) => {
+          if (conn) {
+            HdcDeviceManager.shellResultAsString(CmdConstant.CMD_GET_DEBUG_PROCESS, false).then((res) => {
+              resolve(Cmd.convertOutProcessList(res));
+            });
+          } else {
+            reject(-1);
+          }
+        });
+      }
+    });
+  }
+
+  static getProcess(): Promise<string[]> {
+    return new Promise((resolve, reject) => {
+      if (SpRecordTrace.isVscode) {
+        let cmd = Cmd.formatString(CmdConstant.CMD_GET_PROCESS_DEVICES, [SpRecordTrace.serialNumber]);
+        Cmd.execHdcCmd(cmd, (res: string) => {
+          resolve(Cmd.convertOutProcessList(res));
+        });
+      } else {
+        HdcDeviceManager.connect(SpRecordTrace.serialNumber).then((conn) => {
+          if (conn) {
+            HdcDeviceManager.shellResultAsString(CmdConstant.CMD_GET_PROCESS, false).then((res) => {
+              resolve(Cmd.convertOutProcessList(res));
+            });
+          } else {
+            reject(-1);
+          }
+        });
+      }
+    });
+  }
 }
diff --git a/ide/src/command/CmdConstant.ts b/ide/src/command/CmdConstant.ts
index 3662a1d65c424dd50f06bc0a99cfecf65a434072..428875a4be8b7e3ebdc27bbccca509a5dda0e891 100644
--- a/ide/src/command/CmdConstant.ts
+++ b/ide/src/command/CmdConstant.ts
@@ -22,6 +22,7 @@ export class CmdConstant {
   static CMD_GET_CPU_COUNT = "hdc_std shell grep -c 'processor' /proc/cpuinfo";
   static CMD_GET_HIPERF_EVENTS = 'hdc_std shell hiperf list';
   static CMD_GET_VERSION = 'hdc_std shell param get const.product.software.version';
+  static CMD_GET_DEBUG_PROCESS = `hdc_std shell netstat -anp |grep Panda |grep -v grep | sed \'s/.* \\([0-9]*\\)\\/.*/\\1/\' |xargs -r ps -A -opid,cmd`;
   static CMD_HDC_DEVICES = 'hdc_std list targets';
   static CMD_MOUNT_DEVICES = 'hdc_std -t {0} shell mount -o remount,rw /';
   static CMD_GET_PROCESS_DEVICES = 'hdc_std -t {0} shell ps -A -opid,cmd';
@@ -33,4 +34,5 @@ export class CmdConstant {
     'hdc_std -t {0} shell killall hiprofilerd hiprofiler_plugins native_daemon hiperf hiebpf' + ' hiprofiler_cmd';
   static CMS_STOP = 'hdc_std shell killall hiprofilerd hiprofiler_plugins native_daemon hiperf hiebpf hiprofiler_cmd';
   static CMD_GET_VERSION_DEVICES = 'hdc_std -t {0} shell param get const.product.software.version';
+  static CMD_GET_DEBUG_PROCESS_DEVICES = `hdc_std -t {0} shell netstat -anp |grep Panda |grep -v grep | sed \'s/.* \\([0-9]*\\)\\/.*/\\1/\' |xargs -r ps -A -opid,cmd`;
 }
diff --git a/ide/src/doc/compile_trace_streamer.html b/ide/src/doc/compile_trace_streamer.html
index c4f815ed6827dda36e3d08448fcb2284aa9250fb..64eb5f5aa814dc8f6cc4851d9f3fe0a942343c26 100644
--- a/ide/src/doc/compile_trace_streamer.html
+++ b/ide/src/doc/compile_trace_streamer.html
@@ -809,11 +809,11 @@ git pull
 │   └── prebuilts/emsdk/emsdk/lib
 │       └── prebuilts/emsdk/emsdk/lib/clang
 └── prebuilts/emsdk/node
-    └── prebuilts/emsdk/node/16.20.0_64bit
-        ├── prebuilts/emsdk/node/16.20.0_64bit/bin
-        ├── prebuilts/emsdk/node/16.20.0_64bit/include
-        ├── prebuilts/emsdk/node/16.20.0_64bit/lib
-        └── prebuilts/emsdk/node/16.20.0_64bit/share
+    └── prebuilts/emsdk/node/14.18.2_64bit
+        ├── prebuilts/emsdk/node/14.18.2_64bit/bin
+        ├── prebuilts/emsdk/node/14.18.2_64bit/include
+        ├── prebuilts/emsdk/node/14.18.2_64bit/lib
+        └── prebuilts/emsdk/node/14.18.2_64bit/share
 </code></pre>
       <p class="fontColor">之后调用</p>
       <pre
diff --git a/ide/src/trace/SpApplication.ts b/ide/src/trace/SpApplication.ts
index d184d380f669bb2c03fa98cdbad1fbb027061dac..2a4dc45f3d8263851f90aa88deaf492124e2557a 100644
--- a/ide/src/trace/SpApplication.ts
+++ b/ide/src/trace/SpApplication.ts
@@ -361,6 +361,7 @@ export class SpApplication extends BaseElement {
                         </svg>
                     </div>
                     <lit-search id="lit-search"></lit-search>
+                    <lit-search id="lit-record-search"></lit-search>
                 </div>
                 <img class="filter-config" title="Display Template" src="img/config_filter.png" style="display: block;text-align: right;position: absolute;right: 1.2em;cursor: pointer;top: 20px">
                 <lit-progress-bar class="progress"></lit-progress-bar>
@@ -411,6 +412,7 @@ export class SpApplication extends BaseElement {
     let menu = mainMenu.shadowRoot?.querySelector('.menu-button') as HTMLDivElement;
     let progressEL = this.shadowRoot?.querySelector('.progress') as LitProgressBar;
     let litSearch = this.shadowRoot?.querySelector('#lit-search') as LitSearch;
+    let litRecordSearch = this.shadowRoot?.querySelector('#lit-record-search') as LitSearch;
     let search = this.shadowRoot?.querySelector('.search-container') as HTMLElement;
     let sidebarButton: HTMLDivElement | undefined | null = this.shadowRoot?.querySelector('.sidebar-button');
     let childNodes = [
@@ -575,8 +577,8 @@ export class SpApplication extends BaseElement {
         menu!.style.pointerEvents = 'auto';
         sidebarButton!.style.pointerEvents = 'auto';
         that.search = true;
-        litSearch.setPercent('', 101);
-        litSearch.clear();
+        litRecordSearch.style.display = 'none';
+        litSearch.style.display = 'block';
         window.publish(window.SmartEvent.UI.KeyboardEnable, {
           enable: true,
         });
@@ -585,6 +587,8 @@ export class SpApplication extends BaseElement {
         menu!.style.pointerEvents = 'none';
         sidebarButton!.style.pointerEvents = 'none';
         that.search = litSearch.isLoading;
+        litSearch.style.display = 'none';
+        litRecordSearch.style.display = 'block';
         window.publish(window.SmartEvent.UI.KeyboardEnable, {
           enable: false,
         });
@@ -823,7 +827,7 @@ export class SpApplication extends BaseElement {
     function handleWasmMode(ev: any, showFileName: string, fileSize: string, fileName: string) {
       litSearch.setPercent('', 1);
       threadPool.init('wasm').then((res) => {
-        let reader = new FileReader();
+        let reader: FileReader | null = new FileReader();
         reader.readAsArrayBuffer(ev as any);
         reader.onloadend = function (ev) {
           info('read file onloadend');
@@ -878,6 +882,7 @@ export class SpApplication extends BaseElement {
                 mainMenu.menus = mainMenu.menus!;
               }
               spInfoAndStats.initInfoAndStatsData();
+              reader = null;
             }
           );
         };
@@ -1251,7 +1256,7 @@ export class SpApplication extends BaseElement {
     );
   }
 
-  private download(mainMenu: LitMainMenu, fileName: string, isServer: boolean, dbName?: string) {
+  private async download(mainMenu: LitMainMenu, fileName: string, isServer: boolean, dbName?: string) {
     let a = document.createElement('a');
     if (isServer) {
       if (dbName != '') {
diff --git a/ide/src/trace/bean/JankFramesStruct.ts b/ide/src/trace/bean/JankFramesStruct.ts
index f539d0a664131bf53c9219771f5e39e0d942262b..d5155b4e1aeeaae703f740f984cec43298e00f06 100644
--- a/ide/src/trace/bean/JankFramesStruct.ts
+++ b/ide/src/trace/bean/JankFramesStruct.ts
@@ -22,5 +22,5 @@ export class JankFramesStruct {
   meanDuration: number = -1;
   meanDurationStr: string = '';
   occurrences: number = 0;
-  flag: boolean = false;
+  flag: number | undefined = 0;
 }
diff --git a/ide/src/trace/bean/JanksStruct.ts b/ide/src/trace/bean/JanksStruct.ts
index e905dfd430b1a8e140261433dcf0300595b2d79d..f0367b201a7af0572e97df035b3029d86fe23916 100644
--- a/ide/src/trace/bean/JanksStruct.ts
+++ b/ide/src/trace/bean/JanksStruct.ts
@@ -25,7 +25,7 @@ export class JanksStruct extends BaseStruct {
   dur: number | undefined;
   name: string | undefined;
   depth: number | undefined;
-  jank_tag: boolean = false;
+  jank_tag: number | undefined;
   cmdline: string | undefined; // process
   jank_type: string | undefined;
   type: string | undefined;
diff --git a/ide/src/trace/component/SpMetrics.ts b/ide/src/trace/component/SpMetrics.ts
index b6aeaa1abddbcf7398911fc74ac0024f3e589731..d8b0d0b79706cdfcf47be6ad2068f9e0e7fbf15a 100644
--- a/ide/src/trace/component/SpMetrics.ts
+++ b/ide/src/trace/component/SpMetrics.ts
@@ -16,12 +16,7 @@
 import { BaseElement, element } from '../../base-ui/BaseElement.js';
 
 import {
-  queryDistributedTerm,
-  querySelectTraceStats,
-  querySystemCalls,
-  querySystemCallsTop,
-  queryTraceCpu,
-  queryTraceCpuTop,
+  querySelectTraceStats, querySystemCalls,
   queryTraceMemory,
   queryTraceMemoryTop,
   queryTraceMemoryUnAgg,
@@ -30,12 +25,8 @@ import {
 } from '../database/SqlLite.js';
 
 import '../../base-ui/table/lit-table.js';
-import { initCpuStrategyData, initTest } from './metrics/CpuStrategy.js';
-import { initDistributedTermData } from './metrics/DistributeTermStrategy.js';
 import { initMemoryAggStrategy } from './metrics/MemAggStrategy.js';
 import { initMemoryStrategy } from './metrics/MemStrategy.js';
-import { initSysCallsStrategy } from './metrics/SysCallsStrategy.js';
-import { initSysCallsTopStrategy } from './metrics/SysCallsTopStrategy.js';
 import { initTraceStateStrategy } from './metrics/TraceStatsStrategy.js';
 import { initTraceTaskStrategy } from './metrics/TraceTaskStrategy.js';
 import { initMetaDataStrategy } from './metrics/MetaDataStrategy.js';
@@ -43,6 +34,7 @@ import { PluginConvertUtils } from './setting/utils/PluginConvertUtils.js';
 import { info } from '../../log/Log.js';
 import { LitProgressBar } from '../../base-ui/progress-bar/LitProgressBar.js';
 import { SpStatisticsHttpUtil } from '../../statistics/util/SpStatisticsHttpUtil.js';
+import { initSysCallsStrategy } from './metrics/SysCallsStrategy.js';
 
 @element('sp-metrics')
 export class SpMetrics extends BaseElement {
@@ -121,7 +113,7 @@ export class SpMetrics extends BaseElement {
     }
   }
 
-  runClickListener = (event: any) => {
+  runClickListener = () => {
     SpStatisticsHttpUtil.addOrdinaryVisitAction({
       event: 'metrics',
       action: 'metrics',
@@ -340,8 +332,3 @@ export interface MetricQueryItem {
   metricQuery: Function;
   metricResultHandle: Function;
 }
-
-export class SpMetricsItem {
-  itemTip: string | undefined;
-  itemValue: any[] | undefined;
-}
diff --git a/ide/src/trace/component/SpQuerySQL.ts b/ide/src/trace/component/SpQuerySQL.ts
index 0b61a99aa224fc2bc08028b0d9617b35eb6df4af..d1656294b1b38433ff12c6f7f88f4131dd625f0b 100644
--- a/ide/src/trace/component/SpQuerySQL.ts
+++ b/ide/src/trace/component/SpQuerySQL.ts
@@ -93,7 +93,7 @@ export class SpQuerySQL extends BaseElement {
       copyResult += keyListKey + '\t';
     }
     copyResult += '\n';
-    let copyData: any = [];
+    let copyData = [];
     if (this.statDataArray.length > this.maxPageSize) {
       copyData = this.sliceData;
     } else {
@@ -105,10 +105,10 @@ export class SpQuerySQL extends BaseElement {
       });
       copyResult += '\n';
     }
-    await (navigator as any).clipboard.writeText(copyResult);
+    await navigator.clipboard.writeText(copyResult);
   }
 
-  selectEventListener = (event: any) => {
+  selectEventListener = (event: KeyboardEvent) => {
     let that = this;
     if (event.ctrlKey && event.keyCode == 13) {
       SpStatisticsHttpUtil.addOrdinaryVisitAction({
@@ -324,7 +324,7 @@ export class SpQuerySQL extends BaseElement {
     this.selector!.addEventListener('keydown', this.deleteSqlListener);
   }
 
-  deleteSqlListener = (event: any) => {
+  deleteSqlListener = (event: KeyboardEvent) => {
     if (event.key == 'Backspace') {
       this.resizeSqlHeight().then(() => {});
     }
@@ -346,7 +346,7 @@ export class SpQuerySQL extends BaseElement {
     this.selector?.style.height = selectHeight;
   }
 
-  inputSqlListener = async (event: any) => {
+  inputSqlListener = async (event: Event) => {
     this.resizeSqlHeight().then(() => {});
     let startData = new Date().getTime();
     if (this.selector!.value.trim() == '') {
diff --git a/ide/src/trace/component/SpRecordTrace.ts b/ide/src/trace/component/SpRecordTrace.ts
index 0f4701cb54b1e2a2d0db910bfcc2badfd9f3c515..55517dc2addeb600ca201dca75d0276cfaec8bf6 100644
--- a/ide/src/trace/component/SpRecordTrace.ts
+++ b/ide/src/trace/component/SpRecordTrace.ts
@@ -523,7 +523,7 @@ export class SpRecordTrace extends BaseElement {
     }
   }
 
-  private refreshDeviceTimer: any;
+  private refreshDeviceTimer: number | undefined;
 
   initElements(): void {
     let parentElement = this.parentNode as HTMLElement;
@@ -651,7 +651,7 @@ export class SpRecordTrace extends BaseElement {
     this.recordButtonText = this.shadowRoot?.querySelector('.record_text') as HTMLSpanElement;
     this.sp = document.querySelector('sp-application') as SpApplication;
     this.progressEL = this.sp.shadowRoot?.querySelector('.progress') as LitProgressBar;
-    this.litSearch = this.sp.shadowRoot?.querySelector('#lit-search') as LitSearch;
+    this.litSearch = this.sp.shadowRoot?.querySelector('#lit-record-search') as LitSearch;
     if (this.deviceSelect!.options && this.deviceSelect!.options.length > 0) {
       this.disconnectButton!.hidden = false;
       this.recordButton!.hidden = false;
@@ -666,16 +666,16 @@ export class SpRecordTrace extends BaseElement {
         this.stopRecordListener();
       }
     });
-    this.spRecordPerf!.addEventListener('addProbe', (event: any) => {
+    this.spRecordPerf!.addEventListener('addProbe', () => {
       this.showHint = false;
     });
-    this.spAllocations!.addEventListener('addProbe', (event: any) => {
+    this.spAllocations!.addEventListener('addProbe', () => {
       this.showHint = false;
     });
-    this.probesConfig!.addEventListener('addProbe', (event: any) => {
+    this.probesConfig!.addEventListener('addProbe', () => {
       this.showHint = false;
     });
-    this.spRecordTemplate!.addEventListener('addProbe', (event: any) => {
+    this.spRecordTemplate!.addEventListener('addProbe', () => {
       this.showHint = false;
     });
     this.menuGroup = this.shadowRoot?.querySelector('#menu-group') as LitMainMenuGroup;
@@ -1868,14 +1868,14 @@ export class SpRecordTrace extends BaseElement {
     return htraceProfilerPluginConfig;
   }
 
-  static appendSerialize(profilerPluginConfig: ProfilerPluginConfig<any>) {
+  static appendSerialize(profilerPluginConfig: ProfilerPluginConfig<{}>) {
     if (Number(SpRecordTrace.selectVersion) >= 4.0) {
     }
   }
 
   private createSdkConfig() {
     let gpuConfig = this.spSdkConfig!.getGpuConfig();
-    let gpuPluginConfig: ProfilerPluginConfig<any> = {
+    let gpuPluginConfig: ProfilerPluginConfig<{}> = {
       pluginName: this.spSdkConfig!.getPlugName(),
       sampleInterval: this.spSdkConfig!.getSampleInterval(),
       configData: gpuConfig,
@@ -1897,8 +1897,8 @@ export class SpRecordTrace extends BaseElement {
   }
 
   public startRefreshDeviceList() {
-    if (this.refreshDeviceTimer == null) {
-      this.refreshDeviceTimer = setInterval(() => {
+    if (this.refreshDeviceTimer === undefined) {
+      this.refreshDeviceTimer = window.setInterval(() => {
         this.refreshDeviceList();
       }, 5000);
     }
diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts
index 16d1e12e83d9dd3bcbbc44d1b86cb2f565454c97..5a7cd590f37075d4d798ed978a119804e9d4c760 100644
--- a/ide/src/trace/component/SpSystemTrace.ts
+++ b/ide/src/trace/component/SpSystemTrace.ts
@@ -76,6 +76,7 @@ import { TabPaneSummary } from './trace/sheet/snapshot/TabPaneSummary.js';
 import { LitTabs } from '../../base-ui/tabs/lit-tabs.js';
 import { SpJsMemoryChart } from './chart/SpJsMemoryChart.js';
 import { TraceRowConfig } from './trace/base/TraceRowConfig.js';
+import { HeapTimelineStruct } from '../database/ui-worker/ProcedureWorkerHeapTimeline.js';
 import { TabPaneCurrentSelection } from './trace/sheet/TabPaneCurrentSelection.js';
 
 function dpr() {
@@ -174,7 +175,7 @@ export class SpSystemTrace extends BaseElement {
       shadowRoot?.querySelector("div.bottom > div.color");
     let rightButton: HTMLElement | null | undefined =
       this.shadowRoot?.querySelector("div > trace-sheet")?.shadowRoot?.
-        querySelector("#current-selection > tabpane-current-selection")?.shadowRoot?.querySelector("#rightButton")
+      querySelector("#current-selection > tabpane-current-selection")?.shadowRoot?.querySelector("#rightButton")
     this.rowsEL = this.shadowRoot?.querySelector<HTMLDivElement>('.rows');
     this.tipEL = this.shadowRoot?.querySelector<HTMLDivElement>('.tip');
     this.rowsPaneEL = this.shadowRoot?.querySelector<HTMLDivElement>('.rows-pane');
@@ -287,18 +288,23 @@ export class SpSystemTrace extends BaseElement {
           }
         }
         let row = currentRow;
+        let allowExpansionRow = [];
         while (row.hasParentRowEl) {
           let parent = row.parentRowEl;
-          if (!parent.expansion && parent.hasAttribute('scene')) {
-            parent.expansion = true;
-          }
+          allowExpansionRow.push(parent);
           row = parent;
         }
+        for (let index: number = allowExpansionRow.length - 1; index >= 0; index--) {
+          if (!allowExpansionRow[index]?.expansion && allowExpansionRow[index]?.hasAttribute('scene')) {
+            allowExpansionRow[index].expansion = true;
+          }
+        }
+        allowExpansionRow.length = 0;
         let replaceRow = this.rowsEL!.querySelector<HTMLCanvasElement>(
           `div[row-id='${currentRow.rowId}-${currentRow.rowType}']`
         );
         if (replaceRow != null) {
-          // 取消收藏时，删除父亲ID 
+          // 取消收藏时，删除父亲ID
           let rowNameArr = currentRow.name.split("(");
           if (rowNameArr.length > 1) {
             let tempName = "";
@@ -445,6 +451,7 @@ export class SpSystemTrace extends BaseElement {
         } else if (it.rowType == TraceRow.ROW_TYPE_CPU_FREQ_LIMIT) {
           selection.cpuFreqLimitDatas.push(it.dataList!);
         } else if (it.rowType == TraceRow.ROW_TYPE_PROCESS) {
+          this.pushPidToSelection(selection, it.rowId!);
           let processChildRows: Array<TraceRow<any>> = [
             ...this.shadowRoot!.querySelectorAll<TraceRow<any>>(`trace-row[row-parent-id='${it.rowId}']`),
           ];
@@ -489,14 +496,11 @@ export class SpSystemTrace extends BaseElement {
           });
           info('load nativeMemory traceRow id is : ', it.rowId);
         } else if (it.rowType == TraceRow.ROW_TYPE_THREAD) {
-          let pid = parseInt(it.rowParentId!);
-          // @ts-ignore
-          if (!selection.processIds.includes(pid)) {
-            selection.processIds.push(pid);
-          }
+          this.pushPidToSelection(selection, it.rowParentId!);
           selection.threadIds.push(parseInt(it.rowId!));
           info('load thread traceRow id is : ', it.rowId);
         } else if (it.rowType == TraceRow.ROW_TYPE_FUNC) {
+          this.pushPidToSelection(selection, it.rowParentId!);
           if (it.asyncFuncName) {
             selection.funAsync.push({
               name: it.asyncFuncName,
@@ -523,6 +527,26 @@ export class SpSystemTrace extends BaseElement {
             selection.nativeMemory.push(it.rowId!);
           }
           info('load nativeMemory traceRow id is : ', it.rowId);
+        } else if (it.rowType == TraceRow.ROW_TYPE_MONITOR) {
+          let abilityChildRows: Array<TraceRow<any>> = [
+            ...this.shadowRoot!.querySelectorAll<TraceRow<any>>(`trace-row[row-parent-id='${it.rowId}']`),
+          ];
+          if (!it.expansion) {
+            abilityChildRows = [...it.childrenList];
+          }
+          abilityChildRows.forEach((th) => {
+            th.rangeSelect = true;
+            th.checkType = '2';
+            if (th.rowType == TraceRow.ROW_TYPE_CPU_ABILITY) {
+              selection.cpuAbilityIds.push(th.rowId!);
+            } else if (th.rowType == TraceRow.ROW_TYPE_MEMORY_ABILITY) {
+              selection.memoryAbilityIds.push(th.rowId!);
+            } else if (th.rowType == TraceRow.ROW_TYPE_DISK_ABILITY) {
+              selection.diskAbilityIds.push(th.rowId!);
+            } else if (th.rowType == TraceRow.ROW_TYPE_NETWORK_ABILITY) {
+              selection.networkAbilityIds.push(th.rowId!);
+            }
+          });
         } else if (it.rowType == TraceRow.ROW_TYPE_CPU_ABILITY) {
           selection.cpuAbilityIds.push(it.rowId!);
           info('load CPU Ability traceRow id is : ', it.rowId);
@@ -657,21 +681,51 @@ export class SpSystemTrace extends BaseElement {
               }
             }
           });
-        } else if (it.rowType == TraceRow.ROW_TYPE_JANK && it.name == 'Actual Timeline') {
+        } else if (it.rowType == TraceRow.ROW_TYPE_JANK) {
           let isIntersect = (a: JanksStruct, b: RangeSelectStruct) =>
-            Math.max(a.ts! + a.dur!, b!.endNS || 0) - Math.min(a.ts!, b!.startNS || 0) <
-            a.dur! + (b!.endNS || 0) - (b!.startNS || 0);
-          let jankDatas = it.dataList.filter((jankData: any) => {
-            return isIntersect(jankData, TraceRow.rangeSelectObject!);
+              Math.max(a.ts! + a.dur!, b!.endNS || 0) - Math.min(a.ts!, b!.startNS || 0) <
+              a.dur! + (b!.endNS || 0) - (b!.startNS || 0);
+          if (it.name == 'Actual Timeline') {
+            selection.jankFramesData = [];
+            let jankDatas = it.dataList.filter((jankData: any) => {
+              return isIntersect(jankData, TraceRow.rangeSelectObject!);
+            });
+            selection.jankFramesData.push(jankDatas);
+          } else if (it.folder) {
+            selection.jankFramesData = [];
+            it.childrenList.forEach(child => {
+              if (child.rowType == TraceRow.ROW_TYPE_JANK && child.name == 'Actual Timeline') {
+                let jankDatas = child.dataList.filter((jankData: any) => {
+                  return isIntersect(jankData, TraceRow.rangeSelectObject!);
+                });
+                selection.jankFramesData.push(jankDatas);
+              }
+            })
+          }
+        } else if (it.rowType === TraceRow.ROW_TYPE_HEAP_TIMELINE || it.rowType === TraceRow.ROW_TYPE_JS_MEMORY) {
+          selection.jsMemory.push(it.rowId);
+          let jsMemoryRows: Array<TraceRow<HeapTimelineStruct>> = [
+            ...this.shadowRoot!.querySelectorAll<TraceRow<HeapTimelineStruct>>(
+              `trace-row[row-parent-id='${it.rowId}']`
+            ),
+          ];
+          if (!it.expansion) {
+            jsMemoryRows = [...it.childrenList];
+          }
+          jsMemoryRows.forEach((th) => {
+            if (th.rowType === TraceRow.ROW_TYPE_HEAP_TIMELINE) {
+              it.dataList.length === 0 ? th.dataList : it.dataList;
+              selection.jsMemory.push(th.rowId);
+            } else {
+              selection.jsMemory = [];
+            }
           });
-          selection.jankFramesData.push(jankDatas);
-        } else if (it.rowType == TraceRow.ROW_TYPE_HEAP_TIMELINE) {
           let endNS = TraceRow.rangeSelectObject?.endNS ? TraceRow.rangeSelectObject?.endNS : TraceRow.range?.endNS;
           let startNS = TraceRow.rangeSelectObject?.startNS
             ? TraceRow.rangeSelectObject?.startNS
             : TraceRow.range?.startNS;
           let minNodeId, maxNodeId;
-          if (!it.dataList) {
+          if (!it.dataList || it.dataList.length === 0) {
             return;
           }
           for (let sample of it.dataList) {
@@ -679,7 +733,7 @@ export class SpSystemTrace extends BaseElement {
               minNodeId = sample.lastAssignedId;
             }
             if (sample.timestamp * 1000 >= endNS!) {
-              if (maxNodeId == undefined) {
+              if (maxNodeId === undefined) {
                 maxNodeId = sample.lastAssignedId;
               }
             }
@@ -701,7 +755,6 @@ export class SpSystemTrace extends BaseElement {
             ?.querySelector('#box-heap-summary')
             ?.querySelector('tabpane-summary') as TabPaneSummary;
           summary.initSummaryData(SpJsMemoryChart.file, minNodeId, maxNodeId);
-          selection.jsMemory.push(1);
         }
         if (this.rangeTraceRow!.length !== rows.length) {
           let event = this.createPointEvent(it);
@@ -791,7 +844,9 @@ export class SpSystemTrace extends BaseElement {
           tr.sleeping = true;
           this.visibleRows = this.visibleRows.filter((it) => !it.sleeping);
         } else {
-          this.visibleRows.push(tr);
+          if (!this.visibleRows.find( vr => vr.rowId === tr.rowId && vr.rowType === tr.rowType && vr.rowParentId === tr.rowParentId)) {
+            this.visibleRows.push(tr);
+          }
           tr.sleeping = false;
         }
         if (this.handler) clearTimeout(this.handler);
@@ -821,7 +876,7 @@ export class SpSystemTrace extends BaseElement {
     window.subscribe(window.SmartEvent.UI.SliceMark, (data) => {
       this.sliceMarkEventHandler(data);
     });
-    window.subscribe(window.SmartEvent.UI.TraceRowComplete, (tr) => { });
+    window.subscribe(window.SmartEvent.UI.TraceRowComplete, (tr) => {});
     window.subscribe(window.SmartEvent.UI.RefreshCanvas, () => {
       this.refreshCanvas(false);
     });
@@ -833,6 +888,13 @@ export class SpSystemTrace extends BaseElement {
     });
   }
 
+  pushPidToSelection(selection: SelectionParam, id: string) {
+    let pid = parseInt(id);
+    if (!selection.processIds.includes(pid)) {
+      selection.processIds.push(pid);
+    }
+  }
+
   private createPointEvent(it: TraceRow<any>) {
     let event = this.eventMap[it.rowType + ''];
     if (event) {
@@ -962,7 +1024,7 @@ export class SpSystemTrace extends BaseElement {
   timerShaftELRangeClick = (sliceTime: SlicesTime | undefined | null) => {
     if (sliceTime) {
       setTimeout(() => {
-        this.traceSheetEL?.displayCurrent(sliceTime); // 给当前pane准备数据            
+        this.traceSheetEL?.displayCurrent(sliceTime); // 给当前pane准备数据
         let selection = this.timerShaftEL!.selectionMap.get(sliceTime.id);
         if (selection) {
           selection.isCurrentPane = true;  // 设置当前面板为可以显示的状态
@@ -1084,20 +1146,20 @@ export class SpSystemTrace extends BaseElement {
     });
     //draw flag line segment for canvas
     drawFlagLineSegment(this.canvasPanelCtx, this.hoverFlag, this.selectFlag, {
-      x: 0,
-      y: 0,
-      width: this.timerShaftEL?.canvas?.clientWidth,
-      height: this.canvasPanel?.clientHeight,
-    },
+        x: 0,
+        y: 0,
+        width: this.timerShaftEL?.canvas?.clientWidth,
+        height: this.canvasPanel?.clientHeight,
+      },
       this.timerShaftEL!
     );
     //draw flag line segment for favorite canvas
     drawFlagLineSegment(this.canvasFavoritePanelCtx, this.hoverFlag, this.selectFlag, {
-      x: 0,
-      y: 0,
-      width: this.timerShaftEL?.canvas?.clientWidth,
-      height: this.canvasFavoritePanel?.clientHeight,
-    },
+        x: 0,
+        y: 0,
+        width: this.timerShaftEL?.canvas?.clientWidth,
+        height: this.canvasFavoritePanel?.clientHeight,
+      },
       this.timerShaftEL!
     );
     //draw wakeup for main canvas
@@ -1160,7 +1222,6 @@ export class SpSystemTrace extends BaseElement {
         } as Rect,
       )
     };
-
     // Draw the connection curve
     if (this.linkNodes) {
       drawLinkLines(this.canvasPanelCtx!, this.linkNodes, this.timerShaftEL!, false);
@@ -1187,7 +1248,7 @@ export class SpSystemTrace extends BaseElement {
         x > (TraceRow.rangeSelectObject?.startX || 0) &&
         x < (TraceRow.rangeSelectObject?.endX || 0)
       ) {
-        let findSlicestime = this.timerShaftEL!.sportRuler?.findSlicesTime(x, y); // 查找帽子  
+        let findSlicestime = this.timerShaftEL!.sportRuler?.findSlicesTime(x, y); // 查找帽子
         if (!findSlicestime) { // 如果没有找到帽子，则绘制一个三角形的旗子
           let time = Math.round(
             (x * (TraceRow.range?.endNS! - TraceRow.range?.startNS!)) /
@@ -1260,7 +1321,7 @@ export class SpSystemTrace extends BaseElement {
     if (this.keyboardEnable) {
       if (keyPress == 'm') {
         this.slicestime = this.setSLiceMark(ev.shiftKey);
-        // 设置currentPane可以显示，并且修改调色板颜色和刚刚绘制的帽子颜色保持一致。 
+        // 设置currentPane可以显示，并且修改调色板颜色和刚刚绘制的帽子颜色保持一致。
         this.traceSheetEL = this.shadowRoot?.querySelector('.trace-sheet');
         let currentPane = this.traceSheetEL?.displayTab<TabPaneCurrent>('tabpane-current');
         if (this.slicestime) {
@@ -1450,7 +1511,7 @@ export class SpSystemTrace extends BaseElement {
         this.hoverStructNull();
       }
       rows
-        .filter((it) => it.focusContain(ev,this.inFavoriteArea!) && it.collect === this.inFavoriteArea)
+        .filter((it) => it.focusContain(ev, this.inFavoriteArea!) && it.collect === this.inFavoriteArea)
         .filter((it) => {
           if (it.collect) {
             return true;
@@ -1560,7 +1621,7 @@ export class SpSystemTrace extends BaseElement {
     ) {
     } else {
       let inFavoriteArea = this.favoriteRowsEL?.containPoint(ev);
-      let rows = this.visibleRows.filter((it) => it.focusContain(ev,inFavoriteArea!) && it.collect == inFavoriteArea);
+      let rows = this.visibleRows.filter((it) => it.focusContain(ev, inFavoriteArea!) && it.collect == inFavoriteArea);
       if (JankStruct.delJankLineFlag) {
         this.clearPointPair();
       }
@@ -1673,7 +1734,9 @@ export class SpSystemTrace extends BaseElement {
     };
 
     cpuClickHandler = (d: CpuStruct) => {
-      let traceRow = this.shadowRoot?.querySelector<TraceRow<any>>(`trace-row[row-id='${d.processId}'][row-type='process']`);
+      let traceRow = this.shadowRoot?.querySelector<TraceRow<any>>(
+        `trace-row[row-id='${d.processId}'][row-type='process']`
+      );
       if (traceRow) {
         traceRow.expansion = true;
       }
@@ -2118,8 +2181,6 @@ export class SpSystemTrace extends BaseElement {
     }
   }
 
-
-
   connectedCallback() {
     this.initPointToEvent();
     /**
@@ -2176,7 +2237,7 @@ export class SpSystemTrace extends BaseElement {
       ev => throttle(this.myMouseMove, 350, ev)(),
       { passive: false }
     );
-	
+
     this.addEventListener(
       'mouseup',
       (e) => {
@@ -2195,6 +2256,12 @@ export class SpSystemTrace extends BaseElement {
       { passive: false }
     );
 
+    /**
+     * 泳道图中添加ctrl+鼠标滚轮事件，对泳道图进行放大缩小。
+     * 鼠标滚轮事件转化为键盘事件，keyPress和keyUp两个事件需要配合使用，
+     * 否则泳道图会一直放大或一直缩小。
+     * setTimeout()函数中的时间参数可以控制鼠标滚轮的频率。
+     */
     document.addEventListener(
       'wheel',
       (e) => {
@@ -2295,33 +2362,27 @@ export class SpSystemTrace extends BaseElement {
     }
   }
 
-  scrollToFunction(rowId: string, rowParentId: string, rowType: string, smooth: boolean = true, afterScroll: any) {
-    let row = this.shadowRoot!.querySelector<TraceRow<any>>(`trace-row[row-id='${rowParentId}'][folder]`);
-    if (row) {
-      row.expansion = true;
-    }
-    let funcRow = this.shadowRoot!.querySelector<TraceRow<any>>(`trace-row[row-id='${rowId}'][row-type='${rowType}']`);
-    if (funcRow == null) {
-      let threadRow = this.shadowRoot!.querySelector<TraceRow<any>>(`trace-row[row-id='${rowId}'][row-type='thread']`);
-      this.rowsPaneEL!.scroll({
-        top: threadRow!.offsetTop - this.canvasPanel!.offsetHeight + threadRow!.offsetHeight + threadRow!.offsetHeight,
+  scrollToFunction(rowId: string, rowParentId: string, rowType: string, smooth: boolean = true) {
+    let condition = `trace-row[row-id='${rowId}'][row-type='${rowType}'][row-parent-id='${rowParentId}']`;
+    let rootRow = this.shadowRoot!.querySelector<TraceRow<any>>(condition);
+    if (rootRow?.collect) {
+      this.favoriteRowsEL!.scroll({
+        top: (rootRow?.offsetTop || 0) - this.canvasFavoritePanel!.offsetHeight + (rootRow?.offsetHeight || 0),
         left: 0,
-        behavior: undefined,
+        behavior: smooth ? 'smooth' : undefined,
       });
-      if (threadRow != null) {
-        if (threadRow.isComplete) {
-          afterScroll();
-        } else {
-          threadRow.onComplete = () => {
-            funcRow = this.shadowRoot!.querySelector<TraceRow<any>>(
-              `trace-row[row-id='${rowId}'][row-type='${rowType}']`
-            );
-            afterScroll();
-          };
-        }
-      }
     } else {
-      afterScroll();
+      let row = this.shadowRoot!.querySelector<TraceRow<any>>(`trace-row[row-id='${rowParentId}'][folder]`);
+      if (row && !row.expansion) {
+        row.expansion = true;
+      }
+      if (rootRow && rootRow.offsetTop >= 0 && rootRow.offsetHeight >= 0) {
+        this.rowsPaneEL!.scroll({
+          top: (rootRow?.offsetTop || 0) - this.canvasPanel!.offsetHeight + 20,
+          left: 0,
+          behavior: smooth ? 'smooth' : undefined,
+        });
+      }
     }
   }
 
@@ -2653,6 +2714,7 @@ export class SpSystemTrace extends BaseElement {
       `trace-row[row-id='${funcRowID}'][row-type='func']`
     );
     if (targetRow) {
+      targetRow.highlight = highlight;
       //如果目标泳道图在收藏上面，则跳转至收藏
       let searchEntry = targetRow!.dataList!.find((dat) => dat.startTs === funcStract.startTime);
       toTargetDepth(searchEntry);
@@ -2684,8 +2746,11 @@ export class SpSystemTrace extends BaseElement {
     if (filterRow!.isComplete) {
       completeEntry();
     } else {
+      FuncStruct.hoverFuncStruct = funcStract;
+      FuncStruct.selectFuncStruct = funcStract;
+      this.onClickHandler(TraceRow.ROW_TYPE_FUNC);
       this.scrollToProcess(`${funcStract.tid}`, `${funcStract.pid}`, 'process', false);
-      this.scrollToProcess(`${funcStract.tid}`, `${funcStract.pid}`, 'func', true);
+      this.scrollToFunction(`${funcStract.tid}`, `${funcStract.pid}`, 'func', true);
       filterRow!.onComplete = completeEntry;
     }
   }
@@ -2824,9 +2889,9 @@ export class SpSystemTrace extends BaseElement {
     this.loadTraceCompleted = false;
     this.collectRows = [];
     this.visibleRows = [];
-    TraceRowConfig.allTraceRowList.forEach(it => {
+    TraceRowConfig.allTraceRowList.forEach((it) => {
       it.clearMemory();
-    })
+    });
     TraceRowConfig.allTraceRowList = [];
     if (this.favoriteRowsEL) {
       this.favoriteRowsEL.querySelectorAll<TraceRow<any>>(`trace-row`).forEach((row) => {
@@ -2839,7 +2904,7 @@ export class SpSystemTrace extends BaseElement {
         row.clearMemory();
         this.rowsEL!.removeChild(row);
       });
-      this.rowsEL.innerHTML = ''
+      this.rowsEL.innerHTML = '';
     }
     this.traceSheetEL?.clearMemory();
     this.spacerEL!.style.height = '0px';
@@ -2859,8 +2924,8 @@ export class SpSystemTrace extends BaseElement {
     HeapDataInterface.getInstance().clearData();
     procedurePool.clearCache();
     Utils.clearData();
-    procedurePool.submitWithName('logic0', 'clear', {}, undefined, (res: any) => { });
-    procedurePool.submitWithName('logic1', 'clear', {}, undefined, (res: any) => { });
+    procedurePool.submitWithName('logic0', 'clear', {}, undefined, (res: any) => {});
+    procedurePool.submitWithName('logic1', 'clear', {}, undefined, (res: any) => {});
   }
 
   init = async (param: { buf?: ArrayBuffer; url?: string }, wasmConfigUri: string, progress: Function) => {
@@ -2994,6 +3059,7 @@ export class SpSystemTrace extends BaseElement {
       }
     }
   }
+
   queryCPUWakeUpList(data: WakeupBean) {
     TabPaneCurrentSelection.queryCPUWakeUpListFromBean(data).then((a: any) => {
       if (a === null) {
@@ -3003,6 +3069,7 @@ export class SpSystemTrace extends BaseElement {
       this.queryCPUWakeUpList(a);
     });
   }
+
   wakeupListNull() {
     SpSystemTrace.wakeupList = [];
   }
diff --git a/ide/src/trace/component/chart/FrameChart.ts b/ide/src/trace/component/chart/FrameChart.ts
index 7caac20b867068155e7d1a6116385850af57060d..e00285d8aaf8b03e2f0d575fd4b45359a7e9a707 100644
--- a/ide/src/trace/component/chart/FrameChart.ts
+++ b/ide/src/trace/component/chart/FrameChart.ts
@@ -732,12 +732,18 @@ export class FrameChart extends BaseElement {
             let count = ChartStruct.hoverFuncStruct!.count;
             this.hintContent = `
                         <span class="bold">Name: </span> <span class="text">${name} </span> <br>
+                        <span class="bold">Lib: </span> <span class="text">${ChartStruct.hoverFuncStruct?.lib}</span>
+                        <br>
+                        <span class="bold">Addr: </span> <span>${ChartStruct.hoverFuncStruct?.addr}</span> <br>
                         <span class="bold">Count: </span> <span> ${count}</span>`;
             break;
           case ChartMode.Duration:
             let duration = Utils.getProbablyTime(ChartStruct.hoverFuncStruct!.dur);
             this.hintContent = `
                         <span class="bold">Name: </span> <span class="text">${name} </span> <br>
+                        <span class="bold">Lib: </span> <span class="text">${ChartStruct.hoverFuncStruct?.lib}</span>
+                        <br>
+                        <span class="bold">Addr: </span> <span>${ChartStruct.hoverFuncStruct?.addr}</span> <br>
                         <span class="bold">Duration: </span> <span>${duration}</span>`;
             break;
         }
diff --git a/ide/src/trace/component/chart/SpChartManager.ts b/ide/src/trace/component/chart/SpChartManager.ts
index e0512d73de93be5154f916cdbbdc29cf5ecc295c..68ca84d11e1b0aa1c56b4570fdfa117f42a22f98 100644
--- a/ide/src/trace/component/chart/SpChartManager.ts
+++ b/ide/src/trace/component/chart/SpChartManager.ts
@@ -115,8 +115,6 @@ export class SpChartManager {
     progress('fps', 85);
     await this.fps.init();
     info('FPS Data initialized');
-    progress('native memory', 86);
-    await this.nativeMemory.initNativeMemory();
     progress('native memory', 87);
     await this.nativeMemory.initChart();
     info('Native Memory Data initialized');
@@ -181,6 +179,8 @@ export class SpChartManager {
         endNS = startNS + 1;
       }
       this.trace.timerShaftEL.totalNS = total;
+      this.trace.timerShaftEL.getRangeRuler()!.drawMark = true;
+      this.trace.timerShaftEL.setRangeNS(0,total);
       (window as any).recordStartNS = startNS;
       (window as any).recordEndNS = endNS;
       (window as any).totalNS = total;
diff --git a/ide/src/trace/component/chart/SpJsMemoryChart.ts b/ide/src/trace/component/chart/SpJsMemoryChart.ts
index 0a612cbaf05531e9c8f34745c836abaf703d0d8d..d173e67481714d3154f78f29426b22cce1715a1f 100644
--- a/ide/src/trace/component/chart/SpJsMemoryChart.ts
+++ b/ide/src/trace/component/chart/SpJsMemoryChart.ts
@@ -37,6 +37,8 @@ export class SpJsMemoryChart implements ParseListener {
       let jsHeapRow = TraceRow.skeleton();
       let process = '';
       let heapFile = HeapDataInterface.getInstance().getFileStructs();
+      let file = heapFile[0];
+      let samples = HeapDataInterface.getInstance().getSamples(file.id);
       process = String(heapFile[0].pid);
       jsHeapRow.rowId = `js-memory`;
       jsHeapRow.index = 0;
@@ -49,7 +51,7 @@ export class SpJsMemoryChart implements ParseListener {
       jsHeapRow.favoriteChangeHandler = this.trace.favoriteChangeHandler;
       jsHeapRow.selectChangeHandler = this.trace.selectChangeHandler;
       jsHeapRow.onDrawTypeChangeHandler = (type) => {};
-      jsHeapRow.supplier = () => new Promise<Array<any>>((resolve) => resolve([]));
+      jsHeapRow.supplier = () => new Promise<Array<any>>((resolve) => resolve(samples));
       jsHeapRow.onThreadHandler = (useCache) => {
         jsHeapRow.canvasSave(this.trace.canvasPanelCtx!);
         if (jsHeapRow.expansion) {
@@ -67,10 +69,8 @@ export class SpJsMemoryChart implements ParseListener {
         jsHeapRow.canvasRestore(this.trace.canvasPanelCtx!);
       };
       this.trace.rowsEL?.appendChild(jsHeapRow);
-      let file = heapFile[0];
       SpJsMemoryChart.file = file;
       if (file.name.includes('Timeline')) {
-        let samples = HeapDataInterface.getInstance().getSamples(file.id);
         let heapTimelineRow = TraceRow.skeleton<HeapTimelineStruct>();
         heapTimelineRow.index = 0;
         heapTimelineRow.rowParentId = `js-memory`;
diff --git a/ide/src/trace/component/chart/SpNativeMemoryChart.ts b/ide/src/trace/component/chart/SpNativeMemoryChart.ts
index 1dfd5acad6fb1853211864136b227c81a4e60e08..990412d9a0be83932fb91af80e4ba19f2425fcd3 100644
--- a/ide/src/trace/component/chart/SpNativeMemoryChart.ts
+++ b/ide/src/trace/component/chart/SpNativeMemoryChart.ts
@@ -51,6 +51,7 @@ export class SpNativeMemoryChart {
     if (nativeProcess.length == 0) {
       return;
     }
+    await this.initNativeMemory();
     SpNativeMemoryChart.EVENT_HEAP = await queryHeapGroupByEvent(nativeMemoryType);
     let nativeRow = TraceRow.skeleton();
     let process = '';
diff --git a/ide/src/trace/component/chart/SpProcessChart.ts b/ide/src/trace/component/chart/SpProcessChart.ts
index 30322cbb819792dfc774e30b8cdcf8007e385a51..8fbf784afa964dc8a1387f0f869c03f93165d9b4 100644
--- a/ide/src/trace/component/chart/SpProcessChart.ts
+++ b/ide/src/trace/component/chart/SpProcessChart.ts
@@ -57,7 +57,7 @@ export class SpProcessChart {
   private processThreadDataCountMap: Map<number, number> = new Map();
   private processFuncDataCountMap: Map<number, number> = new Map();
   private processMemDataCountMap: Map<number, number> = new Map();
-  private threadFuncMaxDepthMap: Map<number, number> = new Map();
+  private threadFuncMaxDepthMap: Map<string, number> = new Map();
 
   constructor(trace: SpSystemTrace) {
     this.trace = trace;
@@ -73,13 +73,13 @@ export class SpProcessChart {
   initDeliverInputEvent = async () => {
     let row = TraceRow.skeleton();
     row.setAttribute('disabled-check', '');
-    row.rowId = `DeliverInputEvent`;
+    row.rowId = 'DeliverInputEvent';
     row.index = 0;
     row.rowType = TraceRow.ROW_TYPE_DELIVER_INPUT_EVENT;
     row.rowParentId = '';
     row.folder = true;
     row.style.height = '40px';
-    row.name = `DeliverInputEvent`;
+    row.name = 'DeliverInputEvent';
     row.supplier = FolderSupplier();
     row.onThreadHandler = FolderThreadHandler(row, this.trace);
 
@@ -121,7 +121,7 @@ export class SpProcessChart {
         funcRow.rowType = TraceRow.ROW_TYPE_FUNC;
         funcRow.rowParentId = `${row.rowId}`;
         funcRow.rowHidden = !row.expansion;
-        funcRow.style.width = `100%`;
+        funcRow.style.width = '100%';
         funcRow.style.height = `${maxHeight}px`;
         funcRow.setAttribute('height', `${maxHeight}`);
         funcRow.name = `${asyncFuncGroups[0].funName} ${key}`;
@@ -151,7 +151,7 @@ export class SpProcessChart {
     let threadFuncMaxDepthArray = await getMaxDepthByTid();
     info('Gets the maximum tier per thread , tid and maxDepth');
     threadFuncMaxDepthArray.forEach((it) => {
-      this.threadFuncMaxDepthMap.set(it.tid, it.maxDepth);
+      this.threadFuncMaxDepthMap.set(`${it.ipid}-${it.tid}`, it.maxDepth);
     });
     info('convert tid and maxDepth array to map');
     let pidCountArray = await queryProcessContentCount();
@@ -174,7 +174,6 @@ export class SpProcessChart {
       return pre;
     }, {});
     this.processThreads = Utils.removeDuplicates(queryProcessThreadResult, queryProcessThreadsByTableResult, 'tid');
-
     info('The amount of initialized process threads data is : ', this.processThreads!.length);
     if (
       this.eventCountMap['print'] == 0 &&
@@ -285,11 +284,11 @@ export class SpProcessChart {
           expectedRow.rowType = TraceRow.ROW_TYPE_JANK;
           expectedRow.rowParentId = `${it.pid}`;
           expectedRow.rowHidden = !processRow.expansion;
-          expectedRow.style.width = `100%`;
+          expectedRow.style.width = '100%';
           expectedRow.style.height = `${maxHeight}px`;
           expectedRow.setAttribute('height', `${maxHeight}`);
           expectedRow.setAttribute('frame_type', expectedData[0].frame_type);
-          expectedRow.name = `Expected Timeline`;
+          expectedRow.name = 'Expected Timeline';
           expectedRow.addTemplateTypes('FrameTimeline');
           expectedRow.setAttribute('children', '');
           expectedRow.supplier = () =>
@@ -305,7 +304,7 @@ export class SpProcessChart {
               {
                 context: context,
                 useCache: useCache,
-                type: `expected_frame_timeline_slice`,
+                type: 'expected_frame_timeline_slice',
               },
               expectedRow!
             );
@@ -335,6 +334,9 @@ export class SpProcessChart {
                   if (isIntersect(depthArray[depthArray.length - 1], actualItem)) {
                     actualItem.depth = depthArray.length;
                     depthArray.push(actualItem);
+                  } else {
+                    actualItem.depth = depthArray.length - 1;
+                    depthArray[length - 1] = actualItem;
                   }
                 } else {
                   actualItem.depth = 0;
@@ -350,10 +352,10 @@ export class SpProcessChart {
             actualRow.rowType = TraceRow.ROW_TYPE_JANK;
             actualRow.rowParentId = `${it.pid}`;
             actualRow.rowHidden = !processRow.expansion;
-            actualRow.style.width = `100%`;
+            actualRow.style.width = '100%';
             actualRow.style.height = `${maxHeight}px`;
             actualRow.setAttribute('height', `${maxHeight}`);
-            actualRow.name = `Actual Timeline`;
+            actualRow.name = 'Actual Timeline';
             actualRow.addTemplateTypes('FrameTimeline');
             actualRow.setAttribute('frame_type', actualData[0].frame_type);
             actualRow.setAttribute('children', '');
@@ -368,7 +370,7 @@ export class SpProcessChart {
                 {
                   context: context,
                   useCache: useCache,
-                  type: `actual_frame_timeline_slice`,
+                  type: 'actual_frame_timeline_slice',
                 },
                 actualRow!
               );
@@ -495,7 +497,7 @@ export class SpProcessChart {
           funcRow.rowType = TraceRow.ROW_TYPE_FUNC;
           funcRow.rowParentId = `${it.pid}`;
           funcRow.rowHidden = !processRow.expansion;
-          funcRow.style.width = `100%`;
+          funcRow.style.width = '100%';
           funcRow.style.height = `${maxHeight}px`;
           funcRow.setAttribute('height', `${maxHeight}`);
           funcRow.name = `${asyncFunctions[0].funName}`;
@@ -531,7 +533,7 @@ export class SpProcessChart {
         row.rowParentId = `${it.pid}`;
         row.rowHidden = !processRow.expansion;
         row.style.height = '40px';
-        row.style.width = `100%`;
+        row.style.width = '100%';
         row.name = `${mem.trackName}`;
         row.setAttribute('children', '');
         row.favoriteChangeHandler = this.trace.favoriteChangeHandler;
@@ -589,13 +591,13 @@ export class SpProcessChart {
         threadRow.rowHidden = !processRow.expansion;
         threadRow.index = j;
         threadRow.style.height = '30px';
-        threadRow.style.width = `100%`;
+        threadRow.style.width = '100%';
         threadRow.name = `${thread.threadName || 'Thread'} ${thread.tid}`;
         threadRow.setAttribute('children', '');
         threadRow.favoriteChangeHandler = this.trace.favoriteChangeHandler;
         threadRow.selectChangeHandler = this.trace.selectChangeHandler;
         threadRow.supplier = () =>
-          queryThreadData(thread.tid || 0).then((res) => {
+          queryThreadData(thread.tid || 0, it.pid || 0).then((res) => {
             if (res.length <= 0) {
               threadRow.rowDiscard = true;
               this.trace.refreshCanvas(true);
@@ -628,8 +630,8 @@ export class SpProcessChart {
         } else {
           processRow.addChildTraceRow(threadRow);
         }
-        if (this.threadFuncMaxDepthMap.get(thread.tid!) != undefined) {
-          let max = this.threadFuncMaxDepthMap.get(thread.tid!) || 1;
+        if (this.threadFuncMaxDepthMap.get(`${thread.upid}-${thread.tid}`) != undefined) {
+          let max = this.threadFuncMaxDepthMap.get(`${thread.upid}-${thread.tid}`) || 1;
           let maxHeight = max * 20;
           let funcRow = TraceRow.skeleton<FuncStruct>();
           funcRow.rowId = `${thread.tid}`;
@@ -637,12 +639,12 @@ export class SpProcessChart {
           funcRow.rowParentId = `${it.pid}`;
           funcRow.rowHidden = !processRow.expansion;
           funcRow.checkType = threadRow.checkType;
-          funcRow.style.width = `100%`;
+          funcRow.style.width = '100%';
           funcRow.style.height = `${maxHeight}px`;
           funcRow.name = `${thread.threadName || 'Thread'} ${thread.tid}`;
           funcRow.setAttribute('children', '');
           funcRow.supplier = () =>
-            getFunDataByTid(thread.tid || 0).then((funs: Array<FuncStruct>) => {
+            getFunDataByTid(thread.tid || 0, thread.upid || 0).then((funs: Array<FuncStruct>) => {
               if (funs.length > 0) {
                 let isBinder = (data: FuncStruct): boolean => {
                   return (
diff --git a/ide/src/trace/component/metrics/CpuStrategy.ts b/ide/src/trace/component/metrics/CpuStrategy.ts
index 42ab450fb0430c7dae9c84f2afe479cdfc4be946..18603eef6b4eec6a812e8a88bcef224f6549029e 100644
--- a/ide/src/trace/component/metrics/CpuStrategy.ts
+++ b/ide/src/trace/component/metrics/CpuStrategy.ts
@@ -15,40 +15,15 @@
 
 import { info } from '../../../log/Log.js';
 
-export const initTest = (metricData: Array<any>): ProcessInfoListItem => {
-  let processInfoListItems: Array<ProcessInfoItem> = [];
-  for (let index = 0; index < metricData.length; index++) {
-    let eventName = metricData[index].event_name;
-    let stat_type = metricData[index].stat_type;
-    let count = metricData[index].count;
-    let source = metricData[index].source;
-    let serverity = metricData[index].serverity;
-
-    let processInfoSource: ProcessInfoItem = {
-      // @ts-ignore
-      processName: eventName,
-      threads: {
-        // @ts-ignore
-        threadName: stat_type,
-        cpu: [
-          {
-            cpu: eventName,
-            minFreq: stat_type,
-            maxFreq: count,
-            avgFrequency: source,
-            duration: serverity,
-          },
-        ],
-      },
-    };
-    processInfoListItems?.push(processInfoSource);
-  }
-  return {
-    processInfo: processInfoListItems,
-  };
-};
-
-export const initCpuStrategyData = (metricData: Array<any>): ProcessInfoListItem => {
+export const initCpuStrategyData = (metricData: Array<{
+  tid: string;
+  pid: string;
+  cpu: string;
+  dur: string;
+  min_freq: string;
+  max_freq: string;
+  avg_frequency: string;
+}>): ProcessInfoListItem => {
   info('Cpu Strategy data length is:', metricData.length);
   let processInfoListItems: Array<ProcessInfoItem> = [];
   if (metricData.length == 10) {
diff --git a/ide/src/trace/component/metrics/DistributeTermStrategy.ts b/ide/src/trace/component/metrics/DistributeTermStrategy.ts
index 67bc60e8afae758fccc82a5561e5a01459366ef5..faf65092ab7abf7c8b2d566adabd609f02fcfd26 100644
--- a/ide/src/trace/component/metrics/DistributeTermStrategy.ts
+++ b/ide/src/trace/component/metrics/DistributeTermStrategy.ts
@@ -15,7 +15,20 @@
 
 import { info } from '../../../log/Log.js';
 
-export const initDistributedTermData = (metricData: Array<any>): DistributedTermListItem => {
+export const initDistributedTermData = (metricData: Array<{
+  threadId: string;
+  threadName: string;
+  processId: string;
+  processName: string;
+  funName: string;
+  dur: string;
+  ts: string;
+  chainId: string;
+  spanId: string;
+  parentSpanId: string;
+  flag: string;
+  trace_name: string;
+}>): DistributedTermListItem => {
   info('Distributed Term data length is:', metricData.length);
   let distributedTermListItems: Array<DistributedTermItem> = [];
   const splitChar = ',';
@@ -46,8 +59,8 @@ export const initDistributedTermData = (metricData: Array<any>): DistributedTerm
       let delay: number = 0;
       if (flag.indexOf('S,C') > -1 || flag.indexOf('C,S') > -1) {
         across = false;
-        if (flagList[index] == 'S') receiverTime = timeList[index];
-        if (flagList[index] == 'C') senderTime = timeList[index];
+        if (flagList[index] == 'S') receiverTime = Number(timeList[index]);
+        if (flagList[index] == 'C') senderTime = Number(timeList[index]);
         delay = receiverTime - senderTime;
       }
 
diff --git a/ide/src/trace/component/metrics/MemAggStrategy.ts b/ide/src/trace/component/metrics/MemAggStrategy.ts
index 0d7a24125d730dc85b6bbd2087c24b276ed61577..a65624fee3d1b5d7c6fbb75f5df829eebebd3893 100644
--- a/ide/src/trace/component/metrics/MemAggStrategy.ts
+++ b/ide/src/trace/component/metrics/MemAggStrategy.ts
@@ -15,7 +15,12 @@
 
 import { info } from '../../../log/Log.js';
 
-export const initMemoryAggStrategy = (metricData: Array<any>): ProcessValuesListItem => {
+export const initMemoryAggStrategy = (metricData: Array<{
+  processName: string;
+  name: string;
+  value: string;
+  ts: string;
+}>): ProcessValuesListItem => {
   info('Memory Agg Strategy data length is:', metricData.length);
   let processValuesListItems: Array<ProcessValuesItem> = [];
   const splitChar: string = ',';
@@ -36,7 +41,7 @@ export const initMemoryAggStrategy = (metricData: Array<any>): ProcessValuesList
       let names = metricData[sqlIndex].name.split(splitChar);
       let values = metricData[sqlIndex].value.split(splitChar);
       let times = metricData[sqlIndex].ts.split(splitChar);
-      let oomScoreValue = 0;
+      let oomScoreValue = '0';
       for (let indexScore = 0; indexScore < names.length; indexScore++) {
         if ('oom_score_adj' === names[indexScore]) {
           oomScoreValue = values[indexScore];
@@ -84,7 +89,7 @@ export interface ProcessValuesItem {
 }
 
 export interface TypeItem {
-  ts: number;
-  oom_score: number;
-  value: number;
+  ts: string;
+  oom_score: string;
+  value: string;
 }
diff --git a/ide/src/trace/component/metrics/MemStrategy.ts b/ide/src/trace/component/metrics/MemStrategy.ts
index f7ad94fd34fe572e004c97a11fab2ab03d2b0aa2..fbe52fc858d7590a003b9a63cb0663ff4efc7380 100644
--- a/ide/src/trace/component/metrics/MemStrategy.ts
+++ b/ide/src/trace/component/metrics/MemStrategy.ts
@@ -15,7 +15,13 @@
 
 import { info } from '../../../log/Log.js';
 
-export const initMemoryStrategy = (metricData: Array<any>): ProcessMetricsListItems => {
+export const initMemoryStrategy = (metricData: Array<{
+  maxNum: number;
+  minNum: number;
+  avgNum: number;
+  name: string;
+  processName: string;
+}>): ProcessMetricsListItems => {
   info('Memory Strategy data length is:', metricData.length);
   let processMetricsListItems: Array<ProcessMetricsItems> = [];
   for (let sqlIndex = 0; sqlIndex < metricData.length; sqlIndex++) {
diff --git a/ide/src/trace/component/metrics/MetaDataStrategy.ts b/ide/src/trace/component/metrics/MetaDataStrategy.ts
index 70e75a90d15fa7a36fa4ab11ecd6200314d23bf5..49b4c3f34140018376604b713ce924d8549fa4cd 100644
--- a/ide/src/trace/component/metrics/MetaDataStrategy.ts
+++ b/ide/src/trace/component/metrics/MetaDataStrategy.ts
@@ -15,7 +15,10 @@
 
 import { info } from '../../../log/Log.js';
 
-export const initMetaDataStrategy = (metricData: Array<any>): TraceMetadata => {
+export const initMetaDataStrategy = (metricData: Array<{
+  name: string;
+  valueText: string;
+}>): TraceMetadata => {
   info('Meta Strategy data length is:', metricData.length);
   let traceMetaDataList: Array<TraceMetadataItem> = [];
   let statDataArray = [];
diff --git a/ide/src/trace/component/metrics/SysCallsStrategy.ts b/ide/src/trace/component/metrics/SysCallsStrategy.ts
index b57d6cb0a87cad8d00c55021487e1fc137a755ea..4483113db5f49aa1244e34ba75af48dde8c9f52f 100644
--- a/ide/src/trace/component/metrics/SysCallsStrategy.ts
+++ b/ide/src/trace/component/metrics/SysCallsStrategy.ts
@@ -15,7 +15,13 @@
 
 import { info } from '../../../log/Log.js';
 
-export const initSysCallsStrategy = (metricData: Array<any>): FunctionListItem => {
+export const initSysCallsStrategy = (metricData: Array<{
+  frequency: string;
+  minDur: string;
+  maxDur: string;
+  avgDur: number;
+  funName: string;
+}>): FunctionListItem => {
   info('System Calls Strategy data length is:', metricData.length);
   let functionListItems: Array<FunctionItem> = [];
   for (let sqlIndex = 0; sqlIndex < metricData.length; sqlIndex++) {
diff --git a/ide/src/trace/component/metrics/SysCallsTopStrategy.ts b/ide/src/trace/component/metrics/SysCallsTopStrategy.ts
index a78a726dcb24f0fbce99c9428e5d60de243a5c26..5acad7582229e17c7196502e834c5e0aeb4264b8 100644
--- a/ide/src/trace/component/metrics/SysCallsTopStrategy.ts
+++ b/ide/src/trace/component/metrics/SysCallsTopStrategy.ts
@@ -15,7 +15,15 @@
 
 import { info } from '../../../log/Log.js';
 
-export const initSysCallsTopStrategy = (metricData: Array<any>): ProcessInfoListItem => {
+export const initSysCallsTopStrategy = (metricData: Array<{
+  tid: string;
+  pid: string;
+  funName: string;
+  frequency: string;
+  minDur: number;
+  maxDur: number;
+  avgDur: number;
+}>): ProcessInfoListItem => {
   info('System Calls Strategy data length is:', metricData.length);
   let ProcessInfoListItems: Array<ProcessInfoItem> = [];
 
@@ -25,7 +33,7 @@ export const initSysCallsTopStrategy = (metricData: Array<any>): ProcessInfoList
     let functionNames = metricData[sqlIndex].funName;
     let durMaxes = metricData[sqlIndex].maxDur;
     let durMines = metricData[sqlIndex].minDur < 0 ? 0 : metricData[sqlIndex].minDur;
-    let durAvgs = Math.floor(metricData[sqlIndex].avgDur).toString();
+    let durAvgs = Math.floor(metricData[sqlIndex].avgDur);
 
     let processInfoItem: ProcessInfoItem = {
       pid: pidList,
@@ -62,7 +70,7 @@ export interface ThreadsItem {
 
 export interface FunctionItem {
   functionName: string;
-  durMax: string;
-  durMin: string;
-  durAvg: string;
+  durMax: number;
+  durMin: number;
+  durAvg: number;
 }
diff --git a/ide/src/trace/component/metrics/TraceStatsStrategy.ts b/ide/src/trace/component/metrics/TraceStatsStrategy.ts
index dee35e8681ea42bd7c9ee53aed5ae296e09162a3..ef3498f3d50da3de75406a9b483c2522ec109122 100644
--- a/ide/src/trace/component/metrics/TraceStatsStrategy.ts
+++ b/ide/src/trace/component/metrics/TraceStatsStrategy.ts
@@ -15,7 +15,13 @@
 
 import { info } from '../../../log/Log.js';
 
-export const initTraceStateStrategy = (metricData: Array<any>): StatListItem => {
+export const initTraceStateStrategy = (metricData: Array<{
+  event_name: string;
+  stat_type: string;
+  count: number;
+  source: string;
+  serverity: string;
+}>): StatListItem => {
   info('Trace State Strategy data length is:', metricData.length);
   let statListItems: Array<StatItem> = [];
   for (let sqlIndex = 0; sqlIndex < metricData.length; sqlIndex++) {
@@ -42,7 +48,7 @@ export interface StatListItem {
 
 export interface StatItem {
   name: string;
-  count: string;
+  count: number;
   source: string;
   severity: string;
 }
diff --git a/ide/src/trace/component/metrics/TraceTaskStrategy.ts b/ide/src/trace/component/metrics/TraceTaskStrategy.ts
index 6c498cab66c5429b2d9440a233e8b10098b7c870..7d9c8e3af6ac34c18be1ed2851a5857f4f3a45a4 100644
--- a/ide/src/trace/component/metrics/TraceTaskStrategy.ts
+++ b/ide/src/trace/component/metrics/TraceTaskStrategy.ts
@@ -15,7 +15,12 @@
 
 import { info } from '../../../log/Log.js';
 
-export const initTraceTaskStrategy = (metricData: Array<any>): ProcessListItem => {
+export const initTraceTaskStrategy = (metricData: Array<{
+  id: string;
+  pid: string;
+  process_name: string;
+  thread_name: string;
+}>): ProcessListItem => {
   info('Trace Task Strategy data length is:', metricData.length);
   let statListItems = [];
   for (let sqlIndex = 0; sqlIndex < metricData.length; sqlIndex++) {
diff --git a/ide/src/trace/component/setting/SpAllocations.ts b/ide/src/trace/component/setting/SpAllocations.ts
index e8566cd54afcfd31bf52f2bbcc079bb2b629a59d..97c511bbbf8be2f4f202d3828a453898aed5d087 100644
--- a/ide/src/trace/component/setting/SpAllocations.ts
+++ b/ide/src/trace/component/setting/SpAllocations.ts
@@ -111,7 +111,7 @@ export class SpAllocations extends BaseElement {
     this.processId = this.shadowRoot?.getElementById('pid') as LitAllocationSelect;
     let input = this.processId.shadowRoot?.querySelector('.multipleSelect') as HTMLDivElement;
     let sp = document.querySelector('sp-application') as SpApplication;
-    let litSearch = sp?.shadowRoot?.querySelector('#lit-search') as LitSearch;
+    let litSearch = sp?.shadowRoot?.querySelector('#lit-record-search') as LitSearch;
     let allocationProcessData: Array<string> = [];
     input.addEventListener('mousedown', (ev) => {
       if (SpRecordTrace.serialNumber == '') {
@@ -124,56 +124,10 @@ export class SpAllocations extends BaseElement {
     input.addEventListener('inputClick', () => {
       allocationProcessData = [];
       if (SpRecordTrace.serialNumber != '') {
-        if (SpRecordTrace.isVscode) {
-          let cmd = Cmd.formatString(CmdConstant.CMD_GET_PROCESS_DEVICES, [SpRecordTrace.serialNumber]);
-          Cmd.execHdcCmd(cmd, (res: string) => {
-            let allocationsValuesVs: string[] = res.replace(/\r\n/g, '\r').replace(/\n/g, '\r').split(/\r/);
-            for (let lineVal of allocationsValuesVs) {
-              if (lineVal.indexOf('__progname') != -1 || lineVal.indexOf('PID CMD') != -1) {
-                continue;
-              }
-              let allocationsVsProcess: string[] = lineVal.trim().split(' ');
-              if (allocationsVsProcess.length == 2) {
-                let processId = allocationsVsProcess[0];
-                let processName = allocationsVsProcess[1];
-                allocationProcessData.push(processName + '(' + processId + ')');
-              }
-            }
-            this.processId!.processData = allocationProcessData;
-            this.processId!.initData();
-          });
-        } else {
-          HdcDeviceManager.connect(SpRecordTrace.serialNumber).then((rr) => {
-            if (sp.search) {
-              sp.search = false;
-              litSearch.clear();
-            }
-            if (rr) {
-              HdcDeviceManager.shellResultAsString(CmdConstant.CMD_GET_PROCESS, false).then((res) => {
-                if (res) {
-                  let allocationsConfigValues: string[] = res.replace(/\r\n/g, '\r').replace(/\n/g, '\r').split(/\r/);
-                  for (let lineVal of allocationsConfigValues) {
-                    if (lineVal.indexOf('__progname') != -1 || lineVal.indexOf('PID CMD') != -1) {
-                      continue;
-                    }
-                    let allocationsConfigProcess: string[] = lineVal.trim().split(' ');
-                    if (allocationsConfigProcess.length == 2) {
-                      let processId = allocationsConfigProcess[0];
-                      let processName = allocationsConfigProcess[1];
-                      allocationProcessData.push(processName + '(' + processId + ')');
-                    }
-                  }
-                }
-                this.processId!.processData = allocationProcessData;
-                this.processId!.initData();
-              });
-            } else {
-              sp.search = true;
-              litSearch.clear();
-              litSearch.setPercent('please kill other hdc-server! ', -2);
-            }
-          });
-        }
+        Cmd.getProcess().then((processList) => {
+          this.processId!.processData = processList;
+          this.processId!.initData();
+        });
       }
     });
     this.unwindEL = this.shadowRoot?.getElementById('unwind') as HTMLInputElement;
diff --git a/ide/src/trace/component/setting/SpCheckDesBox.ts b/ide/src/trace/component/setting/SpCheckDesBox.ts
index 57918df3de567188acbcedea19c11c723fb5088a..584258e58ec3e732cea732e2a2a0d597151538cd 100644
--- a/ide/src/trace/component/setting/SpCheckDesBox.ts
+++ b/ide/src/trace/component/setting/SpCheckDesBox.ts
@@ -14,7 +14,7 @@
  */
 
 import { BaseElement, element } from '../../../base-ui/BaseElement.js';
-import { LitCheckBox } from '../../../base-ui/checkbox/LitCheckBox.js';
+import { LitCheckBox, LitCheckBoxChangeEvent } from '../../../base-ui/checkbox/LitCheckBox.js';
 
 @element('check-des-box')
 export class SpCheckDesBox extends BaseElement {
@@ -83,9 +83,9 @@ lit-check-box {
   }
 
   public connectedCallback() {
-    this._checkBox?.addEventListener('change', (ev: any) => {
+    this._checkBox?.addEventListener('change', (ev: CustomEventInit<LitCheckBoxChangeEvent>) => {
       let detail = ev.detail;
-      this.checked = detail.checked;
+      this.checked = detail!.checked;
       this.dispatchEvent(new CustomEvent('onchange', { detail }));
     });
   }
diff --git a/ide/src/trace/component/setting/SpFileSystem.ts b/ide/src/trace/component/setting/SpFileSystem.ts
index 7a3cfef2b268f3faa6de8505361218d198a61fb6..ebdebb8e599da57e4cf6714e5eead08b97a362bc 100644
--- a/ide/src/trace/component/setting/SpFileSystem.ts
+++ b/ide/src/trace/component/setting/SpFileSystem.ts
@@ -15,7 +15,7 @@
 
 import { BaseElement, element } from '../../../base-ui/BaseElement.js';
 import { LitSelectV } from '../../../base-ui/select/LitSelectV.js';
-import LitSwitch from '../../../base-ui/switch/lit-switch.js';
+import LitSwitch, { LitSwitchChangeEvent } from '../../../base-ui/switch/lit-switch.js';
 import '../../../base-ui/select/LitSelectV.js';
 import '../../../base-ui/select/LitSelect.js';
 
@@ -33,9 +33,6 @@ export class SpFileSystem extends BaseElement {
   private selectProcess: HTMLInputElement | undefined | null;
 
   private configList: Array<any> = [];
-  private list: Array<any> = [];
-
-  private eventList: Array<any> = ['open', 'close', 'read', 'write'];
 
   set startRecord(start: boolean) {
     if (start) {
@@ -194,9 +191,9 @@ export class SpFileSystem extends BaseElement {
             fileSystemSwitch.checked = false;
           }
           if (config.title == 'Start FileSystem Record') {
-            fileSystemSwitch.addEventListener('change', (event: any) => {
+            fileSystemSwitch.addEventListener('change', (event: CustomEventInit<LitSwitchChangeEvent>) => {
               let detail = event.detail;
-              if (detail.checked) {
+              if (detail!.checked) {
                 this.startFileSystem = true;
               } else {
                 this.startFileSystem = false;
@@ -204,9 +201,9 @@ export class SpFileSystem extends BaseElement {
             });
           }
           if (config.title == 'Start Page Fault Record') {
-            fileSystemSwitch.addEventListener('change', (event: any) => {
+            fileSystemSwitch.addEventListener('change', (event: CustomEventInit<LitSwitchChangeEvent>) => {
               let detail = event.detail;
-              if (detail.checked) {
+              if (detail!.checked) {
                 this.startVirtualMemory = true;
               } else {
                 this.startVirtualMemory = false;
@@ -214,9 +211,9 @@ export class SpFileSystem extends BaseElement {
             });
           }
           if (config.title == 'Start BIO Latency Record') {
-            fileSystemSwitch.addEventListener('change', (event: any) => {
+            fileSystemSwitch.addEventListener('change', (event: CustomEventInit<LitSwitchChangeEvent>) => {
               let detail = event.detail;
-              if (detail.checked) {
+              if (detail!.checked) {
                 this.startIo = true;
               } else {
                 this.startIo = false;
@@ -242,7 +239,6 @@ export class SpFileSystem extends BaseElement {
       }
     });
     this.selectProcess = this.processInput!.shadowRoot?.querySelector('input') as HTMLInputElement;
-    let fileSystemProcessData: Array<string> = [];
     this.selectProcess!.addEventListener('mousedown', (ev) => {
       if (SpRecordTrace.serialNumber == '') {
         this.processInput!.dataSource([], '');
@@ -253,54 +249,12 @@ export class SpFileSystem extends BaseElement {
       if (SpRecordTrace.serialNumber == '') {
         this.processInput?.dataSource([], 'ALL-Process');
       } else {
-        if (SpRecordTrace.isVscode) {
-          let cmd = Cmd.formatString(CmdConstant.CMD_GET_PROCESS_DEVICES, [SpRecordTrace.serialNumber]);
-          Cmd.execHdcCmd(cmd, (res: string) => {
-            fileSystemProcessData = [];
-            let fileSystemValuesVs: string[] = res.replace(/\r\n/g, '\r').replace(/\n/g, '\r').split(/\r/);
-            for (let lineVal of fileSystemValuesVs) {
-              if (lineVal.indexOf('__progname') != -1 || lineVal.indexOf('PID CMD') != -1) {
-                continue;
-              }
-              let fileSystemProcessVs: string[] = lineVal.trim().split(' ');
-              if (fileSystemProcessVs.length == 2) {
-                let processId = fileSystemProcessVs[0];
-                let processName = fileSystemProcessVs[1];
-                fileSystemProcessData.push(processName + '(' + processId + ')');
-              }
-            }
-            if (fileSystemProcessData.length > 0 && this.startRecord) {
-              this.processInput!.setAttribute('readonly', 'readonly');
-            }
-            this.processInput?.dataSource(fileSystemProcessData, 'ALL-Process');
-          });
-        } else {
-          HdcDeviceManager.connect(SpRecordTrace.serialNumber).then((conn) => {
-            if (conn) {
-              HdcDeviceManager.shellResultAsString(CmdConstant.CMD_GET_PROCESS, false).then((res) => {
-                fileSystemProcessData = [];
-                if (res) {
-                  let fileSystemValues: string[] = res.replace(/\r\n/g, '\r').replace(/\n/g, '\r').split(/\r/);
-                  for (let lineVal of fileSystemValues) {
-                    if (lineVal.indexOf('__progname') != -1 || lineVal.indexOf('PID CMD') != -1) {
-                      continue;
-                    }
-                    let fileSystemProcess: string[] = lineVal.trim().split(' ');
-                    if (fileSystemProcess.length == 2) {
-                      let processId = fileSystemProcess[0];
-                      let processName = fileSystemProcess[1];
-                      fileSystemProcessData.push(processName + '(' + processId + ')');
-                    }
-                  }
-                }
-                if (fileSystemProcessData.length > 0 && this.startRecord) {
-                  this.selectProcess!.setAttribute('readonly', 'readonly');
-                }
-                this.processInput?.dataSource(fileSystemProcessData, 'ALL-Process');
-              });
-            }
-          });
-        }
+        Cmd.getProcess().then((processList) => {
+          if (processList.length > 0 && this.startRecord) {
+            this.processInput!.setAttribute('readonly', 'readonly');
+          }
+          this.processInput?.dataSource(processList, 'ALL-Process');
+        });
       }
     });
     this.disable();
diff --git a/ide/src/trace/component/setting/SpHisysEvent.ts b/ide/src/trace/component/setting/SpHisysEvent.ts
index c0105ca32dc00309fc2e1d4e748d55c6e671f516..3c75eaf3045060a82945511fcad448476f3cf213 100644
--- a/ide/src/trace/component/setting/SpHisysEvent.ts
+++ b/ide/src/trace/component/setting/SpHisysEvent.ts
@@ -14,7 +14,7 @@
  */
 
 import { BaseElement, element } from '../../../base-ui/BaseElement.js';
-import LitSwitch from '../../../base-ui/switch/lit-switch.js';
+import LitSwitch, { LitSwitchChangeEvent } from '../../../base-ui/switch/lit-switch.js';
 import '../../../base-ui/select/LitAllocationSelect.js';
 
 import '../../../base-ui/switch/lit-switch.js';
@@ -88,9 +88,9 @@ export class SpHisysEvent extends BaseElement {
             hisysEventSwitch.checked = false;
           }
           if (config.title == 'Start Hisystem Event Tracker Record') {
-            hisysEventSwitch.addEventListener('change', (event: any) => {
+            hisysEventSwitch.addEventListener('change', (event: CustomEventInit<LitSwitchChangeEvent>) => {
               let detail = event.detail;
-              if (detail.checked) {
+              if (detail!.checked) {
                 this.startSamp = true;
                 this.unDisable();
               } else {
diff --git a/ide/src/trace/component/setting/SpJsHeap.ts b/ide/src/trace/component/setting/SpJsHeap.ts
index 74f14a048ca7e903fdb34316e47c766abe042862..0cf21bbab518a60b963e288cd226ca6cd26c4c3b 100644
--- a/ide/src/trace/component/setting/SpJsHeap.ts
+++ b/ide/src/trace/component/setting/SpJsHeap.ts
@@ -20,8 +20,6 @@ import '../../../base-ui/switch/lit-switch.js';
 import { LitAllocationSelect } from '../../../base-ui/select/LitAllocationSelect.js';
 import { SpRecordTrace } from '../SpRecordTrace.js';
 import { Cmd } from '../../../command/Cmd.js';
-import { CmdConstant } from '../../../command/CmdConstant.js';
-import { HdcDeviceManager } from '../../../hdc/HdcDeviceManager.js';
 import { LitRadioBox } from '../../../base-ui/radiobox/LitRadioBox.js';
 import { SpCheckDesBox } from './SpCheckDesBox.js';
 
@@ -77,7 +75,6 @@ export class SpJsHeap extends BaseElement {
     this.interval = this.shadowRoot?.querySelector('#interval');
     this.processInput = this.shadowRoot?.querySelector<LitAllocationSelect>('lit-allocation-select');
     let processInput = this.processInput?.shadowRoot?.querySelector('.multipleSelect') as HTMLDivElement;
-    let processData: Array<string> = [];
     processInput!.addEventListener('mousedown', (ev) => {
       if (SpRecordTrace.serialNumber == '') {
         this.processInput!.processData = [];
@@ -89,50 +86,10 @@ export class SpJsHeap extends BaseElement {
         this.processInput!.processData = [];
         this.processInput!.initData();
       } else {
-        if (SpRecordTrace.isVscode) {
-          let cmd = Cmd.formatString(CmdConstant.CMD_GET_PROCESS_DEVICES, [SpRecordTrace.serialNumber]);
-          Cmd.execHdcCmd(cmd, (res: string) => {
-            processData = [];
-            let lineValues: string[] = res.replace(/\r\n/g, '\r').replace(/\n/g, '\r').split(/\r/);
-            for (let lineVal of lineValues) {
-              if (lineVal.indexOf('__progname') != -1 || lineVal.indexOf('PID CMD') != -1) {
-                continue;
-              }
-              let process: string[] = lineVal.trim().split(' ');
-              if (process.length == 2) {
-                let processId = process[0];
-                let processName = process[1];
-                processData.push(processName + '(' + processId + ')');
-              }
-            }
-            this.processInput!.processData = processData;
-            this.processInput!.initData();
-          });
-        } else {
-          HdcDeviceManager.connect(SpRecordTrace.serialNumber).then((conn) => {
-            if (conn) {
-              HdcDeviceManager.shellResultAsString(CmdConstant.CMD_GET_PROCESS, false).then((res) => {
-                processData = [];
-                if (res) {
-                  let lineValues: string[] = res.replace(/\r\n/g, '\r').replace(/\n/g, '\r').split(/\r/);
-                  for (let lineVal of lineValues) {
-                    if (lineVal.indexOf('__progname') != -1 || lineVal.indexOf('PID CMD') != -1) {
-                      continue;
-                    }
-                    let process: string[] = lineVal.trim().split(' ');
-                    if (process.length == 2) {
-                      let processId = process[0];
-                      let processName = process[1];
-                      processData.push(processName + '(' + processId + ')');
-                    }
-                  }
-                }
-                this.processInput!.processData = processData;
-                this.processInput!.initData();
-              });
-            }
-          });
-        }
+        Cmd.getDebugProcess().then((processList) => {
+          this.processInput!.processData = processList;
+          this.processInput!.initData();
+        });
       }
     });
     this.interval!.addEventListener('focusout', () => {
diff --git a/ide/src/trace/component/setting/SpProbesConfig.ts b/ide/src/trace/component/setting/SpProbesConfig.ts
index c13b2281d1348cd0050801759d0f27ea8e6e7769..bcf541dd9ad9b955a15d98beaf19dabddf8e7925 100644
--- a/ide/src/trace/component/setting/SpProbesConfig.ts
+++ b/ide/src/trace/component/setting/SpProbesConfig.ts
@@ -15,7 +15,7 @@
 
 import { BaseElement, element } from '../../../base-ui/BaseElement.js';
 import { checkDesBean, SpCheckDesBox } from './SpCheckDesBox.js';
-import { LitCheckBox } from '../../../base-ui/checkbox/LitCheckBox.js';
+import { LitCheckBox, LitCheckBoxChangeEvent } from '../../../base-ui/checkbox/LitCheckBox.js';
 import { LitRadioGroup } from '../../../base-ui/radiobox/LitRadioGroup.js';
 import { info, log } from '../../../log/Log.js';
 import { LitSlider } from '../../../base-ui/slider/LitSlider';
@@ -122,7 +122,7 @@ export class SpProbesConfig extends BaseElement {
       checkDesBox.value = configBean.value;
       checkDesBox.checked = configBean.isSelect;
       checkDesBox.des = configBean.des;
-      checkDesBox.addEventListener('onchange', (ev: any) => {
+      checkDesBox.addEventListener('onchange', () => {
         this.dispatchEvent(new CustomEvent('addProbe', {}));
       });
       this._traceConfig?.appendChild(checkDesBox);
@@ -148,7 +148,7 @@ export class SpProbesConfig extends BaseElement {
       checkDesBox.value = configBean.value;
       checkDesBox.checked = configBean.isSelect;
       checkDesBox.des = configBean.des;
-      checkDesBox.addEventListener('onchange', (ev: any) => {
+      checkDesBox.addEventListener('onchange', () => {
         this.dispatchEvent(new CustomEvent('addProbe', {}));
       });
       this._memoryConfig?.appendChild(checkDesBox);
@@ -166,7 +166,7 @@ export class SpProbesConfig extends BaseElement {
       checkDesBox.value = configBean.value;
       checkDesBox.checked = configBean.isSelect;
       checkDesBox.des = configBean.des;
-      checkDesBox.addEventListener('onchange', (ev: any) => {
+      checkDesBox.addEventListener('onchange', () => {
         this.dispatchEvent(new CustomEvent('addProbe', {}));
       });
       this._abilityConfig?.appendChild(checkDesBox);
@@ -181,7 +181,6 @@ export class SpProbesConfig extends BaseElement {
       { value: 'app', isSelect: true },
       { value: 'ark', isSelect: true },
       { value: 'binder', isSelect: true },
-      { value: 'commonlibrary', isSelect: false },
       { value: 'daudio', isSelect: false },
       { value: 'dcamera', isSelect: false },
       { value: 'devicemanager', isSelect: false },
@@ -237,12 +236,12 @@ export class SpProbesConfig extends BaseElement {
       litCheckBox.setAttribute('name', 'userEvents');
       litCheckBox.value = hitraceConfig.value;
       litCheckBox.checked = hitraceConfig.isSelect;
-      litCheckBox.addEventListener('change', (ev: any) => {
+      litCheckBox.addEventListener('change', (ev: CustomEventInit<LitCheckBoxChangeEvent>) => {
         let detail = ev.detail;
         if (this.hitrace?.checked == false) {
-          this.hitrace.checked = detail.checked;
+          this.hitrace.checked = detail!.checked;
         }
-        if (detail.checked == false && this.hitrace?.checked == true) {
+        if (detail!.checked == false && this.hitrace?.checked == true) {
           let hasChecked = false;
           const nodes = parent?.querySelectorAll<LitCheckBox>(`lit-check-box[name=userEvents]`);
           nodes.forEach((vv) => {
@@ -504,10 +503,10 @@ export class SpProbesConfig extends BaseElement {
   public connectedCallback() {
     let parent = this.shadowRoot?.querySelector('.user-events') as Element;
     const siblingNode = parent?.querySelectorAll<LitCheckBox>(`lit-check-box[name=userEvents]`);
-    this.hitrace!.addEventListener('onchange', (ev: any) => {
+    this.hitrace!.addEventListener('onchange', (ev: CustomEventInit<LitCheckBoxChangeEvent>) => {
       let detail = ev.detail;
       siblingNode.forEach((node) => {
-        node.checked = detail.checked;
+        node.checked = detail!.checked;
       });
       this.dispatchEvent(new CustomEvent('addProbe', {}));
     });
diff --git a/ide/src/trace/component/setting/SpRecordPerf.ts b/ide/src/trace/component/setting/SpRecordPerf.ts
index f0b0b9daab2a1669c48ea5a67085469963f8337c..ae0b9893424bf72b1403a86852eefc4a84ba535f 100644
--- a/ide/src/trace/component/setting/SpRecordPerf.ts
+++ b/ide/src/trace/component/setting/SpRecordPerf.ts
@@ -17,12 +17,12 @@ import { BaseElement, element } from '../../../base-ui/BaseElement.js';
 import { LitSelectV } from '../../../base-ui/select/LitSelectV.js';
 import { LitSelect } from '../../../base-ui/select/LitSelect.js';
 import { LitSlider } from '../../../base-ui/slider/LitSlider.js';
-import LitSwitch from '../../../base-ui/switch/lit-switch.js';
+import LitSwitch, { LitSwitchChangeEvent } from '../../../base-ui/switch/lit-switch.js';
 import '../../../base-ui/select/LitSelectV.js';
 import '../../../base-ui/select/LitSelect.js';
 
 import '../../../base-ui/switch/lit-switch.js';
-import { info, log } from '../../../log/Log.js';
+import { info } from '../../../log/Log.js';
 import { HdcDeviceManager } from '../../../hdc/HdcDeviceManager.js';
 import { SpRecordTrace } from '../SpRecordTrace.js';
 import { SpApplication } from '../../SpApplication.js';
@@ -272,9 +272,9 @@ export class SpRecordPerf extends BaseElement {
             recordPerfSwitch.checked = false;
           }
           if (config.title == 'Start Hiperf Sampling') {
-            recordPerfSwitch.addEventListener('change', (event: any) => {
+            recordPerfSwitch.addEventListener('change', (event: CustomEventInit<LitSwitchChangeEvent>) => {
               let detail = event.detail;
-              if (detail.checked) {
+              if (detail!.checked) {
                 this.startSamp = true;
                 this.unDisable();
                 this.dispatchEvent(new CustomEvent('addProbe', {}));
@@ -294,11 +294,10 @@ export class SpRecordPerf extends BaseElement {
       recordPerfConfigList!.appendChild(recordPerfDiv);
     });
     let sp = document.querySelector('sp-application') as SpApplication;
-    let recordPerfSearch = sp?.shadowRoot?.querySelector('#lit-search') as LitSearch;
+    let recordPerfSearch = sp?.shadowRoot?.querySelector('#lit-record-search') as LitSearch;
     this.processSelect = this.shadowRoot?.querySelector<LitSelectV>("lit-select-v[title='Process']");
     this.recordProcessInput = this.processSelect?.shadowRoot?.querySelector<HTMLInputElement>('input');
     let querySelector = this.processSelect!.shadowRoot?.querySelector('input') as HTMLInputElement;
-    let recordPerfProcessData: Array<string> = [];
     querySelector.addEventListener('mousedown', (ev) => {
       if (SpRecordTrace.serialNumber == '') {
         this.processSelect!.dataSource([], 'ALL-Process');
@@ -312,58 +311,19 @@ export class SpRecordPerf extends BaseElement {
           sp.search = false;
           recordPerfSearch.clear();
         }
-        if (SpRecordTrace.isVscode) {
-          let cmd = Cmd.formatString(CmdConstant.CMD_GET_PROCESS_DEVICES, [SpRecordTrace.serialNumber]);
-          Cmd.execHdcCmd(cmd, (res: string) => {
-            recordPerfProcessData = [];
-            let recordPerfValuesVs: string[] = res.replace(/\r\n/g, '\r').replace(/\n/g, '\r').split(/\r/);
-            for (let lineVal of recordPerfValuesVs) {
-              if (lineVal.indexOf('__progname') != -1 || lineVal.indexOf('PID CMD') != -1) {
-                continue;
-              }
-              let recordPerfProcessVs: string[] = lineVal.trim().split(' ');
-              if (recordPerfProcessVs.length == 2) {
-                let processId = recordPerfProcessVs[0];
-                let processName = recordPerfProcessVs[1];
-                recordPerfProcessData.push(processName + '(' + processId + ')');
-              }
-            }
-            if (recordPerfProcessData.length > 0 && this.startSamp) {
+        Cmd.getProcess().then(
+          (processList) => {
+            if (processList.length > 0 && this.startSamp) {
               this.recordProcessInput!.setAttribute('readonly', 'readonly');
             }
-            this.processSelect?.dataSource(recordPerfProcessData, 'ALL-Process');
-          });
-        } else {
-          HdcDeviceManager.connect(SpRecordTrace.serialNumber).then((conn) => {
-            if (conn) {
-              HdcDeviceManager.shellResultAsString(CmdConstant.CMD_GET_PROCESS, false).then((res) => {
-                recordPerfProcessData = [];
-                if (res) {
-                  let recordPerfValues: string[] = res.replace(/\r\n/g, '\r').replace(/\n/g, '\r').split(/\r/);
-                  for (let lineVal of recordPerfValues) {
-                    if (lineVal.indexOf('__progname') != -1 || lineVal.indexOf('PID CMD') != -1) {
-                      continue;
-                    }
-                    let recordPerfProcess: string[] = lineVal.trim().split(' ');
-                    if (recordPerfProcess.length == 2) {
-                      let processId = recordPerfProcess[0];
-                      let processName = recordPerfProcess[1];
-                      recordPerfProcessData.push(processName + '(' + processId + ')');
-                    }
-                  }
-                }
-                if (recordPerfProcessData.length > 0 && this.startSamp) {
-                  this.recordProcessInput!.setAttribute('readonly', 'readonly');
-                }
-                this.processSelect?.dataSource(recordPerfProcessData, 'ALL-Process');
-              });
-            } else {
-              sp.search = true;
-              recordPerfSearch.clear();
-              recordPerfSearch.setPercent('please kill other hdc-server !', -2);
-            }
-          });
-        }
+            this.processSelect?.dataSource(processList, 'ALL-Process');
+          },
+          (rejected) => {
+            sp.search = true;
+            recordPerfSearch.clear();
+            recordPerfSearch.setPercent('please kill other hdc-server !', -2);
+          }
+        );
       }
     });
 
diff --git a/ide/src/trace/component/setting/SpRecordTemplate.ts b/ide/src/trace/component/setting/SpRecordTemplate.ts
index e4c8e302f01315456fe378f5ae72ae5b33691c5e..8a42e304278a077d6ecf5d54b16a33fa2cfaee8d 100644
--- a/ide/src/trace/component/setting/SpRecordTemplate.ts
+++ b/ide/src/trace/component/setting/SpRecordTemplate.ts
@@ -14,7 +14,7 @@
  */
 
 import { BaseElement, element } from '../../../base-ui/BaseElement.js';
-import LitSwitch from '../../../base-ui/switch/lit-switch.js';
+import LitSwitch, { LitSwitchChangeEvent } from '../../../base-ui/switch/lit-switch.js';
 import { ProfilerPluginConfig, TracePluginConfig } from './bean/ProfilerServiceTypes.js';
 import { SpRecordTrace } from '../SpRecordTrace.js';
 
@@ -82,22 +82,22 @@ export class SpRecordTemplate extends BaseElement {
   initElements(): void {
     this.frameTimeline = this.shadowRoot?.querySelector<LitSwitch>('#frame_timeline');
     this.schedulingAnalysis = this.shadowRoot?.querySelector<LitSwitch>('#scheduling_analysis');
-    this.frameTimeline!.addEventListener('change', (event: any) => {
+    this.frameTimeline!.addEventListener('change', (event: CustomEventInit<LitSwitchChangeEvent>) => {
       let detail = event.detail;
-      if (detail.checked) {
+      if (detail!.checked) {
         this.dispatchEvent(new CustomEvent('addProbe', {}));
       }
     });
-    this.schedulingAnalysis!.addEventListener('change', (event: any) => {
+    this.schedulingAnalysis!.addEventListener('change', (event: CustomEventInit<LitSwitchChangeEvent>) => {
       let detail = event.detail;
-      if (detail.checked) {
+      if (detail!.checked) {
         this.dispatchEvent(new CustomEvent('addProbe', {}));
       }
     });
   }
 
-  getTemplateConfig(): Array<ProfilerPluginConfig<any>> {
-    let config: Array<any> = [];
+  getTemplateConfig(): Array<ProfilerPluginConfig<{}>> {
+    let config: Array<ProfilerPluginConfig<{}>> = [];
     let traceEventSet = new Array<string>();
     let hitraceCategories = new Array<string>();
     let useFtracePlugin: boolean = false;
diff --git a/ide/src/trace/component/setting/SpSdkConfig.ts b/ide/src/trace/component/setting/SpSdkConfig.ts
index 2a1b0c10c81c1319cc95485e832ed916040d7540..9e47432a50ded8500fc96645e2f48fdd5feefa7b 100644
--- a/ide/src/trace/component/setting/SpSdkConfig.ts
+++ b/ide/src/trace/component/setting/SpSdkConfig.ts
@@ -18,10 +18,9 @@ import '../../../base-ui/select/LitSelectV.js';
 import '../../../base-ui/select/LitSelect.js';
 
 import '../../../base-ui/switch/lit-switch.js';
-import LitSwitch from '../../../base-ui/switch/lit-switch.js';
+import LitSwitch, { LitSwitchChangeEvent } from '../../../base-ui/switch/lit-switch.js';
 import { LitSelectV } from '../../../base-ui/select/LitSelectV.js';
 import { LitAllocationSelect } from '../../../base-ui/select/LitAllocationSelect.js';
-import { SpRecordTrace } from '../SpRecordTrace.js';
 
 @element('sp-sdk-config')
 export class SpSdkConfig extends BaseElement {
@@ -114,15 +113,16 @@ export class SpSdkConfig extends BaseElement {
     return this.sampleInterval;
   }
 
-  getGpuConfig(): any {
+  getGpuConfig(): {} {
     let configVal = this.shadowRoot?.querySelectorAll<HTMLElement>('.config');
-    let gpuConfig: any = {};
+    let gpuConfig = {};
     for (let i = 0; i < configVal!.length; i++) {
       let configName = configVal![i].getAttribute('configName');
       let type = configVal![i].getAttribute('type');
       if (type == 'enum') {
         let enumValue = configVal![i].getAttribute('value');
         if (enumValue != undefined && enumValue != 'undefined') {
+          // @ts-ignore
           gpuConfig[configName!] = enumValue;
         }
       } else if (type == 'number' || type == 'integer' || type == 'num') {
@@ -130,6 +130,7 @@ export class SpSdkConfig extends BaseElement {
         gpuConfig[configName!] = Number(configVal![i].value);
       } else if (type == 'boolean') {
         let attribute = configVal![i].getAttribute('value');
+        // @ts-ignore
         gpuConfig[configName!] = attribute == 'true';
       } else {
         // @ts-ignore
@@ -172,9 +173,9 @@ export class SpSdkConfig extends BaseElement {
     } catch (e) {}
     this.customConfig = this.shadowRoot?.querySelector<HTMLDivElement>('.configList');
     let switchButton = this.shadowRoot?.querySelector('.config_switch') as LitSwitch;
-    switchButton.addEventListener('change', (event: any) => {
+    switchButton.addEventListener('change', (event: CustomEventInit<LitSwitchChangeEvent>) => {
       let detail = event.detail;
-      if (detail.checked) {
+      if (detail!.checked) {
         this.startSamp = true;
         this.isAbleShowConfig(false);
       } else {
@@ -292,12 +293,12 @@ export class SpSdkConfig extends BaseElement {
         select!.setAttribute('value', this.sdkConfigList.configuration[key].default);
         select!.dataSource(this.sdkConfigList.configuration[key].enum, '');
         this.list.push(select!);
-        select!.addEventListener('click', (event: any) => {
+        select!.addEventListener('click', () => {
           select!.setAttribute('value', select!.value);
         });
       }
     }
-    sdkConfigSwitch.addEventListener('change', (event: any) => {
+    sdkConfigSwitch.addEventListener('change', () => {
       if (sdkConfigSwitch.hasAttribute('checked')) {
         sdkConfigSwitch.setAttribute('value', 'true');
       } else {
diff --git a/ide/src/trace/component/setting/SpTraceCommand.ts b/ide/src/trace/component/setting/SpTraceCommand.ts
index 257e41da5f1857e25bee239351ea353fd91777ca..bc00bb642668c57d7702b8299a5a459cdd644d94 100644
--- a/ide/src/trace/component/setting/SpTraceCommand.ts
+++ b/ide/src/trace/component/setting/SpTraceCommand.ts
@@ -44,7 +44,7 @@ export class SpTraceCommand extends BaseElement {
     this.copyEl?.removeEventListener('click', this.codeCopyEvent);
   }
 
-  codeCopyEvent = (event: any) => {
+  codeCopyEvent = () => {
     this.codeHl?.select();
     document.execCommand('copy');
     let allPlugin: Array<string> = [];
@@ -60,7 +60,7 @@ export class SpTraceCommand extends BaseElement {
     });
   };
 
-  textSelectEvent = (event: any) => {
+  textSelectEvent = () => {
     this.copyEl!.style.backgroundColor = '#FFFFFF';
   };
 
diff --git a/ide/src/trace/component/setting/SpVmTracker.ts b/ide/src/trace/component/setting/SpVmTracker.ts
index ef099a96a80929cb89a8d51a5dd3a95f9d081b9e..d2a8c3deff10f588dbf4f3dafaa937f6be96cafc 100644
--- a/ide/src/trace/component/setting/SpVmTracker.ts
+++ b/ide/src/trace/component/setting/SpVmTracker.ts
@@ -14,7 +14,7 @@
  */
 
 import { BaseElement, element } from '../../../base-ui/BaseElement.js';
-import LitSwitch from '../../../base-ui/switch/lit-switch.js';
+import LitSwitch, { LitSwitchChangeEvent } from '../../../base-ui/switch/lit-switch.js';
 import '../../../base-ui/select/LitAllocationSelect.js';
 
 import '../../../base-ui/switch/lit-switch.js';
@@ -93,9 +93,9 @@ export class SpVmTracker extends BaseElement {
             vmTrackerSwitch.checked = false;
           }
           if (config.title == 'Start VM Tracker Record') {
-            vmTrackerSwitch.addEventListener('change', (event: any) => {
+            vmTrackerSwitch.addEventListener('change', (event: CustomEventInit<LitSwitchChangeEvent>) => {
               let detail = event.detail;
-              if (detail.checked) {
+              if (detail!.checked) {
                 this.startSamp = true;
                 this.unDisable();
               } else {
@@ -116,7 +116,6 @@ export class SpVmTracker extends BaseElement {
     );
     let vmTrackerMul = this.vmTrackerProcessInput?.shadowRoot?.querySelector('.multipleSelect') as HTMLDivElement;
     this.vmTrackerSelectProcess = this.vmTrackerProcessInput!.shadowRoot?.querySelector('input') as HTMLInputElement;
-    let processData: Array<string> = [];
     vmTrackerMul!.addEventListener('mousedown', (ev) => {
       if (SpRecordTrace.serialNumber == '') {
         this.vmTrackerProcessInput!.processData = [];
@@ -128,50 +127,10 @@ export class SpVmTracker extends BaseElement {
         this.vmTrackerProcessInput!.processData = [];
         this.vmTrackerProcessInput!.initData();
       } else {
-        if (SpRecordTrace.isVscode) {
-          let vmTrackerCmd = Cmd.formatString(CmdConstant.CMD_GET_PROCESS_DEVICES, [SpRecordTrace.serialNumber]);
-          Cmd.execHdcCmd(vmTrackerCmd, (res: string) => {
-            processData = [];
-            let lineArray: string[] = res.replace(/\r\n/g, '\r').replace(/\n/g, '\r').split(/\r/);
-            for (let lineVal of lineArray) {
-              if (lineVal.indexOf('__progname') != -1 || lineVal.indexOf('PID CMD') != -1) {
-                continue;
-              }
-              let processArray: string[] = lineVal.trim().split(' ');
-              if (processArray.length == 2) {
-                let processId = processArray[0];
-                let processName = processArray[1];
-                processData.push(processName + '(' + processId + ')');
-              }
-            }
-            this.vmTrackerProcessInput!.processData = processData;
-            this.vmTrackerProcessInput!.initData();
-          });
-        } else {
-          HdcDeviceManager.connect(SpRecordTrace.serialNumber).then((conn) => {
-            if (conn) {
-              HdcDeviceManager.shellResultAsString(CmdConstant.CMD_GET_PROCESS, false).then((result) => {
-                processData = [];
-                if (result) {
-                  let lineValues: string[] = result.replace(/\r\n/g, '\r').replace(/\n/g, '\r').split(/\r/);
-                  for (let lineItem of lineValues) {
-                    if (lineItem.indexOf('__progname') != -1 || lineItem.indexOf('PID CMD') != -1) {
-                      continue;
-                    }
-                    let process: string[] = lineItem.trim().split(' ');
-                    if (process.length == 2) {
-                      let processId = process[0];
-                      let processName = process[1];
-                      processData.push(processName + '(' + processId + ')');
-                    }
-                  }
-                }
-                this.vmTrackerProcessInput!.processData = processData;
-                this.vmTrackerProcessInput!.initData();
-              });
-            }
-          });
-        }
+        Cmd.getProcess().then((processList) => {
+          this.vmTrackerProcessInput!.processData = processList;
+          this.vmTrackerProcessInput!.initData();
+        });
       }
     });
     this.disable();
diff --git a/ide/src/trace/component/setting/utils/PluginConvertUtils.ts b/ide/src/trace/component/setting/utils/PluginConvertUtils.ts
index 4ec9edc8b3d7d8571a61d296919c111a14b65629..d00202810e643389103d1aa341ff0f40de062760 100644
--- a/ide/src/trace/component/setting/utils/PluginConvertUtils.ts
+++ b/ide/src/trace/component/setting/utils/PluginConvertUtils.ts
@@ -135,7 +135,7 @@ export class PluginConvertUtils {
 
   private static handleArray(
     key: string,
-    arr: Array<any>,
+    arr: Array<Object>,
     indentation: number,
     needColon: boolean,
     spacesNumber: number
@@ -223,12 +223,12 @@ export class PluginConvertUtils {
     return humpString.replace(/[A-Z]/g, (value) => '_' + value.toLowerCase());
   }
 
-  private static getMontageStrings(
+  private static getMontageStrings<T extends Object>(
     prefixText: string,
     spacesNumber: number,
     indentation: number,
     key: string,
-    value: any
+    value: T
   ): string {
     return (
       prefixText +
diff --git a/ide/src/trace/component/trace/TimerShaftElement.ts b/ide/src/trace/component/trace/TimerShaftElement.ts
index 06cf4f6097993dfccb78b0f16908808128ced823..a827948659f99c6b19a8276005f8627af3864d43 100644
--- a/ide/src/trace/component/trace/TimerShaftElement.ts
+++ b/ide/src/trace/component/trace/TimerShaftElement.ts
@@ -59,6 +59,27 @@ export function ns2s(ns: number): string {
   return result;
 }
 
+export function ns2UnitS(ns: number, scale: number): string {
+  let one_second = 1_000_000_000; // 1 second
+  let result;
+  if (scale >= 10_000_000_000) {
+    result = (ns / one_second).toFixed(0) + ' s';
+  } else if (scale >= 1_000_000_000) {
+    result = (ns / one_second).toFixed(1) + ' s';
+  } else if (scale >= 100_000_000) {
+    result = (ns / one_second).toFixed(2) + ' s';
+  } else if (scale >= 10_000_000) {
+    result = (ns / one_second).toFixed(3) + ' s';
+  } else if (scale >= 1_000_000) {
+    result = (ns / one_second).toFixed(4) + ' s';
+  } else if (scale >= 100_000) {
+    result = (ns / one_second).toFixed(5) + ' s';
+  } else {
+    result = (ns / one_second).toFixed(6) + ' s';
+  }
+  return result;
+}
+
 export function ns2x(ns: number, startNS: number, endNS: number, duration: number, rect: Rect) {
   if (endNS == 0) {
     endNS = duration;
@@ -113,7 +134,6 @@ export class TimerShaftElement extends BaseElement {
   public selectionList: Array<SelectionParam> = [];
   public selectionMap: Map<string, SelectionParam> = new Map<string, SelectionParam>();
 
-
   get sportRuler(): SportRuler | undefined {
     return this._sportRuler;
   }
@@ -161,7 +181,12 @@ export class TimerShaftElement extends BaseElement {
 
   reset(): void {
     this.loadComplete = false;
+    this.totalNS = 10_000_000_000;
+    this.startNS = 0;
+    this.endNS = 10_000_000_000;
     if (this.rangeRuler) {
+      this.rangeRuler.drawMark = false;
+      this.rangeRuler.range.totalNS = this.totalNS;
       this.rangeRuler.markAObj.frame.x = 0;
       this.rangeRuler.markBObj.frame.x = this.rangeRuler.frame.width;
       this.rangeRuler.cpuUsage = [];
@@ -169,11 +194,12 @@ export class TimerShaftElement extends BaseElement {
       this.sportRuler!.slicesTimeList.length = 0;
       this.selectionList.length = 0;
       this.selectionMap.clear();
+      this.rangeRuler.rangeRect = new Rect(0, 25, this.canvas?.clientWidth || 0, 75);
       this.sportRuler!.isRangeSelect = false;
       this.setSlicesMark();
     }
     this.removeTriangle('inverted');
-    this.totalNS = 10_000_000_000;
+    this.setRangeNS(0,this.endNS);
   }
 
   initElements(): void {
@@ -187,6 +213,10 @@ export class TimerShaftElement extends BaseElement {
     window.subscribe(window.SmartEvent.UI.TimeRange, (b) => this.setRangeNS(b.startNS, b.endNS));
   }
 
+  getRangeRuler() {
+    return this.rangeRuler;
+  }
+
   connectedCallback() {
     if (this.canvas) {
       if (this.isOffScreen) {
@@ -198,7 +228,8 @@ export class TimerShaftElement extends BaseElement {
       }
     }
     if (this.timeTotalEL) this.timeTotalEL.textContent = ns2s(this._totalNS);
-    if (this.timeOffsetEL) this.timeOffsetEL.textContent = ns2s(this._startNS);
+    if (this.timeOffsetEL && this.rangeRuler)
+      this.timeOffsetEL.textContent = ns2UnitS(this._startNS,this.rangeRuler.getScale());
     const width = this.canvas?.clientWidth || 0;
     const height = this.canvas?.clientHeight || 0;
     if (!this.timeRuler) {
@@ -242,8 +273,8 @@ export class TimerShaftElement extends BaseElement {
           if (this._sportRuler) {
             this._sportRuler.range = a;
           }
-          if (this.timeOffsetEL) {
-            this.timeOffsetEL.textContent = ns2s(a.startNS);
+          if (this.timeOffsetEL && this.rangeRuler) {
+            this.timeOffsetEL.textContent = ns2UnitS(a.startNS,this.rangeRuler.getScale());
           }
           if (this.loadComplete) {
             this.rangeChangeHandler?.(a);
@@ -265,10 +296,6 @@ export class TimerShaftElement extends BaseElement {
     return this.rangeRuler?.getRange();
   }
 
-  getRangeRuler() {
-    return this.rangeRuler;
-  }
-
   updateWidth(width: number) {
     this.dpr = window.devicePixelRatio || 1;
     this.canvas!.width = width - (this.totalEL?.clientWidth || 0);
@@ -300,9 +327,9 @@ export class TimerShaftElement extends BaseElement {
   };
 
   documentOnMouseMove = (ev: MouseEvent) => {
-    let x = ev.offsetX - (this.canvas?.offsetLeft || 0);  // 鼠标的x轴坐标  
-    let y = ev.offsetY; // 鼠标的y轴坐标                  
-    let findSlicestime = this.sportRuler?.findSlicesTime(x, y); // 查找帽子    
+    let x = ev.offsetX - (this.canvas?.offsetLeft || 0);  // 鼠标的x轴坐标
+    let y = ev.offsetY; // 鼠标的y轴坐标
+    let findSlicestime = this.sportRuler?.findSlicesTime(x, y); // 查找帽子
     if (!findSlicestime) { // 如果在该位置没有找到一个“帽子”，则可以显示一个旗子。
       this.sportRuler?.showHoverFlag();
       this.rangeRuler?.mouseMove(ev);
@@ -313,7 +340,7 @@ export class TimerShaftElement extends BaseElement {
       }
     } else {
       this.sportRuler?.clearHoverFlag();
-      this.sportRuler?.modifyFlagList(null);//重新绘制旗子，清除hover flag   
+      this.sportRuler?.modifyFlagList(null);//重新绘制旗子，清除hover flag
     }
   };
 
@@ -385,7 +412,6 @@ export class TimerShaftElement extends BaseElement {
   modifySlicesList(slicestime: SlicesTime | null | undefined) {
     this._sportRuler?.modifySicesTimeList(slicestime);
   }
-
   cancelPressFrame() {
     this.rangeRuler?.cancelPressFrame();
   }
@@ -417,7 +443,7 @@ export class TimerShaftElement extends BaseElement {
         selection.isCurrentPane = true;  // 设置当前面板为可以显示的状态
         //把刚刚创建的slicetime和selection对象关联起来，以便后面再次选中“跑道”的时候显示对应的面板。
         this.selectionMap.set(sliceTime.id, selection);
-        this.traceSheetEL?.rangeSelect(selection);  // 显示选中区域对应的面板                 
+        this.traceSheetEL?.rangeSelect(selection);  // 显示选中区域对应的面板
       }
     }
     return sliceTime;
diff --git a/ide/src/trace/component/trace/base/ColorUtils.ts b/ide/src/trace/component/trace/base/ColorUtils.ts
index f838e36e8c1e07bfc0d83f6d1ca96b039583f769..12681ffb2631ed601a8726a969cd028b4c5430ba 100644
--- a/ide/src/trace/component/trace/base/ColorUtils.ts
+++ b/ide/src/trace/component/trace/base/ColorUtils.ts
@@ -51,7 +51,7 @@ export class ColorUtils {
     '#C6D9F2',
   ];
 
-  public static JANK_COLOR: Array<string> = ['#42A14D', '#C0CE85', '#FF651D', '#FFE335', '#009DFA', '#E97978'];
+  public static JANK_COLOR: Array<string> = ['#42A14D', '#C0CE85', '#FF651D', '#E8BE44', '#009DFA', '#E97978'];
   public static MD_PALETTE: Array<string> = ColorUtils.FUNC_COLOR_B;
   public static FUNC_COLOR: Array<string> = ColorUtils.FUNC_COLOR_B;
 
diff --git a/ide/src/trace/component/trace/base/TraceRow.ts b/ide/src/trace/component/trace/base/TraceRow.ts
index 223600a87ffbc12e6ee00598aab098fe233a3aee..ae07e7559cf32f8b558d26709503689c534e64df 100644
--- a/ide/src/trace/component/trace/base/TraceRow.ts
+++ b/ide/src/trace/component/trace/base/TraceRow.ts
@@ -627,11 +627,9 @@ export class TraceRow<T extends BaseStruct> extends HTMLElement {
         info('checkBoxEL target not checked');
         this.rangeSelect = false;
         this.checkType = '0';
-        this.draw();
       } else {
         this.rangeSelect = true;
         this.checkType = '2';
-        this.draw();
       }
       this.setCheckBox(ev.target.checked);
     };
@@ -683,21 +681,23 @@ export class TraceRow<T extends BaseStruct> extends HTMLElement {
       });
     };
     this.collectEL!.onclick = (e) => {
-      this.collect = !this.collect;
-      if (this.collect) {
-        this.describeEl!.draggable = false;
-      } else {
-        this.describeEl!.draggable = false;
+      if (this.isComplete) {
+        this.collect = !this.collect;
+        if (this.collect) {
+          this.describeEl!.draggable = false;
+        } else {
+          this.describeEl!.draggable = false;
+        }
+        document.dispatchEvent(
+          new CustomEvent('collect', {
+            detail: {
+              type: e.type,
+              row: this,
+            },
+          })
+        );
+        this.favoriteChangeHandler?.(this);
       }
-      document.dispatchEvent(
-        new CustomEvent('collect', {
-          detail: {
-            type: e.type,
-            row: this,
-          },
-        })
-      );
-      this.favoriteChangeHandler?.(this);
     };
     if (!this.args['skeleton']) {
       this.initCanvas(this.canvas);
@@ -788,12 +788,10 @@ export class TraceRow<T extends BaseStruct> extends HTMLElement {
       checkList?.forEach((rowItem) => {
         rowItem.checkType = '2';
         rowItem.rangeSelect = true;
-        rowItem.draw();
       });
       checkList2?.forEach((it) => {
         it.checkType = '2';
         it.rangeSelect = true;
-        it.draw();
       });
     } else {
       this.parentRowEl?.setAttribute('check-type', '1');
@@ -804,22 +802,18 @@ export class TraceRow<T extends BaseStruct> extends HTMLElement {
       checkList?.forEach((it) => {
         it.checkType = '2';
         it.rangeSelect = true;
-        it.draw();
       });
       checkList2?.forEach((it) => {
         it.checkType = '2';
         it.rangeSelect = true;
-        it.draw();
       });
       unselectedList?.forEach((item) => {
         item.checkType = '0';
         item.rangeSelect = false;
-        item.draw();
       });
       unselectedList2?.forEach((it) => {
         it.checkType = '0';
         it.rangeSelect = false;
-        it.draw();
       });
     }
 
@@ -832,12 +826,10 @@ export class TraceRow<T extends BaseStruct> extends HTMLElement {
       unselectedList?.forEach((it) => {
         it.checkType = '0';
         it.rangeSelect = false;
-        it.draw();
       });
       unselectedList2?.forEach((it) => {
         it.checkType = '0';
         it.rangeSelect = false;
-        it.draw();
       });
     }
     let traceRowList: Array<TraceRow<any>> = [];
diff --git a/ide/src/trace/component/trace/base/TraceRowConfig.ts b/ide/src/trace/component/trace/base/TraceRowConfig.ts
index 404c637cb863be14555603b3c49183b61740849f..f036c59d9d4c509b61b6d8f6020a41e319753546 100644
--- a/ide/src/trace/component/trace/base/TraceRowConfig.ts
+++ b/ide/src/trace/component/trace/base/TraceRowConfig.ts
@@ -49,6 +49,7 @@ export class TraceRowConfig extends BaseElement {
     this.selectTypeList = [];
     this.sceneTable!.innerHTML = '';
     this.chartTable!.innerHTML = '';
+    this.inputElement!.value = '';
     this.spSystemTrace = this.parentElement!.querySelector<SpSystemTrace>('sp-system-trace');
     this.traceRowList =
       this.spSystemTrace!.shadowRoot?.querySelector('div[class=rows-pane]')!.querySelectorAll<TraceRow<any>>(
@@ -70,7 +71,7 @@ export class TraceRowConfig extends BaseElement {
     });
   }
 
-  initConfigSceneTable(item: any) {
+  initConfigSceneTable(item: string) {
     let div = document.createElement('div');
     div.className = 'scene-option-div';
     div.textContent = item;
@@ -112,29 +113,37 @@ export class TraceRowConfig extends BaseElement {
     optionCheckBox.title = templateType;
     optionCheckBox.setAttribute('search_text', row.name);
     optionCheckBox.addEventListener('change', (e) => {
-      TraceRowConfig.allTraceRowList.forEach((chartRow) => {
-        let upParentRow = getUpParentRow(chartRow);
-        if (upParentRow == row) {
-          if (optionCheckBox.checked) {
-            chartRow.removeAttribute('row-hidden');
-            chartRow.setAttribute('scene', '');
-          } else {
-            chartRow.removeAttribute('scene');
-            chartRow.setAttribute('row-hidden', '');
+      if (row.folder) {
+        TraceRowConfig.allTraceRowList.forEach((chartRow): void => {
+          let upParentRow = chartRow;
+          while (upParentRow.hasParentRowEl) {
+            if (upParentRow.parentRowEl) {
+              upParentRow = upParentRow.parentRowEl;
+            } else {
+              break;
+            }
           }
-        }
-      });
+          if (upParentRow == row) {
+            if (optionCheckBox.checked) {
+              chartRow.removeAttribute('row-hidden');
+              chartRow.setAttribute('scene', '');
+            } else {
+              row.expansion = true;
+              chartRow.removeAttribute('scene');
+              chartRow.setAttribute('row-hidden', '');
+            }
+          }
+        });
+      }
+      if (optionCheckBox.checked) {
+        row.removeAttribute('row-hidden');
+        row.setAttribute('scene', '');
+      } else {
+        row.removeAttribute('scene');
+        row.setAttribute('row-hidden', '');
+      }
       this.refreshSystemPanel();
     });
-
-    let getUpParentRow = (currentTraceRow: TraceRow<any>) => {
-      let newTraceRow = currentTraceRow;
-      if (currentTraceRow.hasParentRowEl) {
-        newTraceRow = currentTraceRow.parentRowEl!;
-        getUpParentRow(newTraceRow);
-      }
-      return newTraceRow;
-    };
     this.chartTable!.append(...[div, optionCheckBox]);
   }
 
diff --git a/ide/src/trace/component/trace/base/TraceSheet.ts b/ide/src/trace/component/trace/base/TraceSheet.ts
index 8ee02db5afd7e85390c080f3bc9018c16620a307..d554f88c83dc82b91548dfaef9b769159d850e23 100644
--- a/ide/src/trace/component/trace/base/TraceSheet.ts
+++ b/ide/src/trace/component/trace/base/TraceSheet.ts
@@ -270,17 +270,24 @@ export class TraceSheet extends BaseElement {
           }
         }
         if (fileList.length > 0) {
+          importFileBt!.disabled = true;
           window.publish(window.SmartEvent.UI.Loading, true);
           threadPool.submit(
             'upload-so',
             '',
             fileList,
-            (res: any) => {
-              window.publish(window.SmartEvent.UI.UploadSOFile, {});
+            (res: string) => {
+              importFileBt!.disabled = false;
+              if (res === 'ok') {
+                window.publish(window.SmartEvent.UI.UploadSOFile, {});
+              } else {
+                window.publish(window.SmartEvent.UI.Error, 'parse so file failed!');
+              }
             },
             'upload-so'
           );
         }
+        fileList.length = 0;
       }
       importFileBt!.files = null;
       importFileBt!.value = '';
diff --git a/ide/src/trace/component/trace/base/TraceSheetConfig.ts b/ide/src/trace/component/trace/base/TraceSheetConfig.ts
index 22eee39f141a77c266b9729424dea93595107f90..fccc11b170adf17a7aaf17f111f0953f091b0a3f 100644
--- a/ide/src/trace/component/trace/base/TraceSheetConfig.ts
+++ b/ide/src/trace/component/trace/base/TraceSheetConfig.ts
@@ -72,8 +72,9 @@ import { TabPanePerfAnalysis } from '../sheet/hiperf/TabPanePerfAnalysis.js';
 import { TabPaneNMStatisticAnalysis } from '../sheet/native-memory/TabPaneNMStatisticAnalysis.js';
 import { TabPaneFilesystemStatisticsAnalysis } from '../sheet/file-system/TabPaneFilesystemStatisticsAnalysis.js';
 import { TabPaneIOTierStatisticsAnalysis } from '../sheet/file-system/TabPaneIOTierStatisticsAnalysis.js';
-import { TabPaneCurrent } from '../sheet/TabPaneCurrent.js';
 import { TabPaneVirtualMemoryStatisticsAnalysis } from '../sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.js';
+import { TabPaneCurrent } from '../sheet/TabPaneCurrent.js';
+
 export let tabConfig: any = {
   'tabpane-current': {
     title: 'Current Selection',
diff --git a/ide/src/trace/component/trace/sheet/TabPaneCurrentSelection.ts b/ide/src/trace/component/trace/sheet/TabPaneCurrentSelection.ts
index 74e66f85972764eba02ccca0656f5555aeee129a..8287c1040ca67290a5b4ef4f9625caaf85405b65 100644
--- a/ide/src/trace/component/trace/sheet/TabPaneCurrentSelection.ts
+++ b/ide/src/trace/component/trace/sheet/TabPaneCurrentSelection.ts
@@ -104,7 +104,7 @@ export class TabPaneCurrentSelection extends BaseElement {
     callback: ((data: WakeupBean | null) => void) | undefined = undefined,
     scrollCallback?: (data: CpuStruct) => void
   ) {
-    this.setTableHeight('300px');
+    this.setTableHeight('550px');
     let leftTitle: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#leftTitle');
     if (leftTitle) {
       leftTitle.innerText = 'Slice Details';
@@ -168,8 +168,7 @@ export class TabPaneCurrentSelection extends BaseElement {
       this.currentSelectionTbl!.dataSource = list;
       let rightArea: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#table-right');
       let rightTitle: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#rightTitle');
-      let rightButton: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#rightButton')
-        ?.shadowRoot?.querySelector("#custom-button");
+      let rightButton: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#rightButton')?.shadowRoot?.querySelector("#custom-button");
       let threadClick = this.currentSelectionTbl?.shadowRoot?.querySelector('#thread-id');
       threadClick?.addEventListener('click', () => {
         //cpu点击
@@ -339,8 +338,7 @@ export class TabPaneCurrentSelection extends BaseElement {
     this.initCanvas();
     let leftTitle: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#leftTitle');
     let rightTitle: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#rightTitle');
-    let rightButton: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#rightButton')
-    ?.shadowRoot?.querySelector("#custom-button");
+    let rightButton: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#rightButton')?.shadowRoot?.querySelector("#custom-button");
     if (rightTitle) {
       rightTitle.style.visibility = 'hidden';
       rightButton!.style.visibility = 'hidden';
@@ -390,11 +388,10 @@ export class TabPaneCurrentSelection extends BaseElement {
   }
 
   setIrqData(data: IrqStruct) {
-    this.setTableHeight('300px');
+    this.setTableHeight('550px');
     this.initCanvas();
     let rightTitle: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#rightTitle');
-    let rightButton: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#rightButton')
-    ?.shadowRoot?.querySelector("#custom-button");
+    let rightButton: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#rightButton')?.shadowRoot?.querySelector("#custom-button");
     if (rightTitle) {
       rightTitle.style.visibility = 'hidden';
       rightButton!.style.visibility = 'hidden';
@@ -426,12 +423,12 @@ export class TabPaneCurrentSelection extends BaseElement {
     scrollWakeUp: (d: any) => void | undefined
   ) {
     //线程信息
-    this.setTableHeight('350px');
+    this.setTableHeight('550px');
     this.initCanvas();
     let leftTitle: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#leftTitle');
     let rightTitle: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#rightTitle');
     let rightButton: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#rightButton')
-    ?.shadowRoot?.querySelector("#custom-button");
+                                                          ?.shadowRoot?.querySelector("#custom-button");
     if (rightTitle) {
       rightTitle.style.visibility = 'hidden';
       rightButton!.style.visibility = 'hidden';
@@ -558,48 +555,14 @@ export class TabPaneCurrentSelection extends BaseElement {
     this.setTableHeight('550px');
     this.tabCurrentSelectionInit('Slice Details');
     let list: any[] = [];
-    list.push({ name: 'Name', value: data.name });
-    list.push({ name: 'StartTime', value: getTimeString(data.ts || 0) });
-    list.push({
-      name: 'Absolute Time',
-      value: ((window as any).recordStartNS + data.ts) / 1000000000,
-    });
-    list.push({
-      name: 'Duration',
-      value: data.dur ? getTimeString(data.dur) : ' ',
-    });
-    if (data.frame_type != 'frameTime') {
-      list.push({
-        name: 'Process',
-        value: data.cmdline + ' ' + data.pid,
-      });
-    }
+    this.setJankCommonMessage(list, data);
     if (data.type == '0') {
-      if (data.jank_tag) {
-        if (data.frame_type === 'render_service') {
-          list.push({
-            name: 'Jank Type',
-            value: 'RenderService Deadline Missed',
-          });
-        } else if (data.frame_type === 'app') {
-          list.push({
-            name: 'Jank Type',
-            value: 'APP Deadline Missed',
-          });
-        } else if (data.frame_type === 'frameTime') {
-          list.push({ name: 'Jank Type', value: 'Deadline Missed' });
-        }
-      } else {
-        list.push({ name: 'Jank Type', value: 'NONE' });
-      }
+      this.setJankType(data, list);
       let jankJumperList = new Array<JankTreeNode>();
       if (data.frame_type === 'render_service') {
         queryGpuDur(data.id!).then((it) => {
           if (it.length > 0) {
-            list.push({
-              name: `<div>Gpu Duration</div>`,
-              value: getTimeString(it[0].gpu_dur),
-            });
+            list.push({ name: `<div>Gpu Duration</div>`, value: getTimeString(it[0].gpu_dur)});
           }
         });
         if (data.src_slice) {
@@ -611,12 +574,9 @@ export class TabPaneCurrentSelection extends BaseElement {
               });
               it.forEach((a: any) => {
                 let appNode = new JankTreeNode(a.name, a.pid, 'app');
-                let timeLineNode = new JankTreeNode(a.name, a.pid, 'frameTime');
-                appNode.children.push(timeLineNode);
+                appNode.children.push(new JankTreeNode(a.name, a.pid, 'frameTime'));
                 jankJumperList.push(appNode);
-                list.push({
-                  name: `<div>Slice</div>`,
-                  value:
+                list.push({name: `<div>Slice</div>`, value:
                     a.cmdline +
                     ' [' +
                     a.name +
@@ -752,21 +712,7 @@ export class TabPaneCurrentSelection extends BaseElement {
           appNode.children.push(rsNode);
           jankJumperList.push(appNode);
           this.currentSelectionTbl!.dataSource = list;
-          let all = this.currentSelectionTbl?.shadowRoot?.querySelectorAll<LitIcon>(`.jank_cla`);
-          all!.forEach((a) => {
-            a!.addEventListener('click', () => {
-              if (scrollCallback) {
-                scrollCallback({
-                  rowId: a.id,
-                  name: a.getAttribute('slice_name'),
-                  pid: a.getAttribute('pid'),
-                });
-              }
-            });
-          });
-          if (callback) {
-            callback(jankJumperList);
-          }
+          this.addJankScrollCallBackEvent(scrollCallback, callback, jankJumperList);
         });
       }
     } else {
@@ -774,6 +720,30 @@ export class TabPaneCurrentSelection extends BaseElement {
     }
   }
 
+  private setJankType(data: JankStruct, list: any[]) {
+    if (data.jank_tag === 1) {
+      if (data.frame_type === 'render_service') {
+        list.push({ name: 'Jank Type', value: 'RenderService Deadline Missed' });
+      } else if (data.frame_type === 'app') {
+        list.push({ name: 'Jank Type', value: 'APP Deadline Missed' });
+      } else if (data.frame_type === 'frameTime') {
+        list.push({ name: 'Jank Type', value: 'Deadline Missed' });
+      }
+    } else if (data.jank_tag === 3) {
+      list.push({ name: 'Jank Type', value: 'Deadline Missed' });
+    } else {
+      list.push({ name: 'Jank Type', value: 'NONE' });
+    }
+  }
+  private setJankCommonMessage(list: any[], data: JankStruct) {
+    list.push({ name: 'Name', value: data.name });
+    list.push({ name: 'StartTime', value: getTimeString(data.ts || 0) });
+    list.push({ name: 'Absolute Time', value: ((window as any).recordStartNS + data.ts) / 1000000000 });
+    list.push({ name: 'Duration', value: data.dur ? getTimeString(data.dur) : ' ' });
+    if (data.frame_type != 'frameTime') {
+      list.push({ name: 'Process', value: data.cmdline + ' ' + data.pid });
+    }
+  }
   private setTableHeight(height: string) {
     this.scrollView!.scrollTop = 0;
     this.currentSelectionTbl!.style.height = height;
@@ -881,6 +851,7 @@ export class TabPaneCurrentSelection extends BaseElement {
     }
     return wb;
   }
+
   /**
    * 查询出 线程唤醒了哪些线程信息
    */
@@ -1056,7 +1027,7 @@ export class TabPaneCurrentSelection extends BaseElement {
             }
             .table-left{
                 width: 50%;
-                height: 500px;
+                height: auto;
                 padding: 0 10px;
             }
             .table-right{
diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts
index 276a3b1cad9b8f5efdd03c8727c87f9379fc3230..20eca20e64daa72b3151b34ec7a4fc4553c433c7 100644
--- a/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts
+++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts
@@ -25,7 +25,7 @@ import { procedurePool } from '../../../../database/Procedure.js';
 @element('tabpane-file-statistics-analysis')
 export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
   private fileStatisticsAnalysisPie: LitChartPie | null | undefined;
-  private fileStatisticsAnalysisCurrentSelection: SelectionParam | any;
+  private fileStatisticsAnalysisCurrentSelection: SelectionParam | null | undefined;
   private fileStatisticsAnalysisProcessData: any;
   private fileStatisticsAnalysisThreadData!: any[];
   private fileStatisticsAnalysisSoData!: any[];
@@ -37,7 +37,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
   private fileStatisticsAnalysisTableThread: LitTable | null | undefined;
   private fileStatisticsAnalysisTableSo: LitTable | null | undefined;
   private fileStatisticsAnalysisTableFunction: LitTable | null | undefined;
-  private sumDur: any;
+  private sumDur: number = 0;
   private fileStatisticsAnalysisRange: HTMLLabelElement | null | undefined;
   private back: HTMLDivElement | null | undefined;
   private tabName: HTMLDivElement | null | undefined;
@@ -46,15 +46,15 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
   private fileStatisticsAnalysisThreadName: string = '';
   private fileStatisticsAnalysisSortColumn: string = '';
   private fileStatisticsAnalysisSortType: number = 0;
-  private typeName: any;
+  private typeName: string = '';
   private currentLevel = -1;
   private currentLevelData!: Array<any>;
-  private processStatisticsData!: any;
-  private typeStatisticsData!: any;
-  private threadStatisticsData!: any;
-  private libStatisticsData!: any;
-  private functionStatisticsData!: any;
-  set data(val: SelectionParam | any) {
+  private processStatisticsData!: {};
+  private typeStatisticsData!: {};
+  private threadStatisticsData!: {};
+  private libStatisticsData!: {};
+  private functionStatisticsData!: {};
+  set data(val: SelectionParam) {
     if (val === this.fileStatisticsAnalysisCurrentSelection) {
       this.fileStatisticsAnalysisPidData.unshift(this.processStatisticsData);
       this.fileStatisticsAnalysisTableProcess!.recycleDataSource = this.fileStatisticsAnalysisPidData;
@@ -70,6 +70,8 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
     this.fileStatisticsAnalysisTableType!.style.display = 'none';
     this.fileStatisticsAnalysisTableFunction!.style.display = 'none';
     this.back!.style.visibility = 'hidden';
+    this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = '';
+    this.tabName!.textContent = '';
     this.fileStatisticsAnalysisRange!.textContent =
       'Selected range: ' + parseFloat(((val.rightNs - val.leftNs) / 1000000.0).toFixed(5)) + ' ms';
     this.fileStatisticsAnalysisProgressEL!.loading = true;
@@ -85,7 +87,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
         },
       ],
       (results: any[]) => {
-        this.getFilesystemProcess(val, results);
+        this.getFilesystemProcess(results);
       }
     );
   }
@@ -119,32 +121,33 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
         this.fileStatisticsAnalysisTableType!.setAttribute('hideDownload', '');
         this.fileStatisticsAnalysisTableProcess?.removeAttribute('hideDownload');
         this.currentLevel = 0;
-        this.processPieChart(this.fileStatisticsAnalysisCurrentSelection);
+        this.processPieChart();
       } else if (this.tabName!.textContent === 'Statistic By Thread AllDuration') {
         this.fileStatisticsAnalysisTableType!.style.display = 'grid';
         this.fileStatisticsAnalysisTableThread!.style.display = 'none';
         this.fileStatisticsAnalysisTableThread!.setAttribute('hideDownload', '');
         this.fileStatisticsAnalysisTableType?.removeAttribute('hideDownload');
         this.currentLevel = 1;
-        this.typePieChart(this.fileStatisticsAnalysisCurrentSelection);
+        this.typePieChart();
       } else if (this.tabName!.textContent === 'Statistic By Library AllDuration') {
         this.fileStatisticsAnalysisTableThread!.style.display = 'grid';
         this.fileStatisticsAnalysisTableSo!.style.display = 'none';
         this.fileStatisticsAnalysisTableSo!.setAttribute('hideDownload', '');
         this.fileStatisticsAnalysisTableThread?.removeAttribute('hideDownload');
         this.currentLevel = 2;
-        this.threadPieChart(this.fileStatisticsAnalysisCurrentSelection);
+        this.threadPieChart();
       } else if (this.tabName!.textContent === 'Statistic By Function AllDuration') {
         this.fileStatisticsAnalysisTableSo!.style.display = 'grid';
         this.fileStatisticsAnalysisTableFunction!.style.display = 'none';
         this.fileStatisticsAnalysisTableFunction!.setAttribute('hideDownload', '');
         this.fileStatisticsAnalysisTableSo?.removeAttribute('hideDownload');
         this.currentLevel = 3;
-        this.libraryPieChart(this.fileStatisticsAnalysisCurrentSelection);
+        this.libraryPieChart();
       }
     });
   }
-  processPieChart(val: any) {
+  processPieChart() {
+    // @ts-ignore
     this.sumDur = this.processStatisticsData.allDuration;
     this.fileStatisticsAnalysisPie!.config = {
       appendPadding: 0,
@@ -166,7 +169,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
       angleClick: (it) => {
         // @ts-ignore
         if (it.tableName != 'other') {
-          this.fileProcessLevelClickEvent(it, val);
+          this.fileProcessLevelClickEvent(it);
         }
       },
       hoverHandler: (data) => {
@@ -182,12 +185,14 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.fileStatisticsAnalysisTableProcess!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let fspData = evt.detail.data;
+    this.fileStatisticsAnalysisTableProcess!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let processData = evt.detail;
+      if (processData.data) {
+        let fspData = processData.data;
         fspData.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (processData.callBack) {
+          processData.callBack(true);
         }
       }
       this.fileStatisticsAnalysisPie?.showHover();
@@ -205,27 +210,28 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.fileStatisticsAnalysisTableProcess!.addEventListener('row-click', (evt: any) => {
+    this.fileStatisticsAnalysisTableProcess!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.duration !== 0) {
-        this.fileProcessLevelClickEvent(data, val);
+        this.fileProcessLevelClickEvent(data);
       }
     });
   }
-  fileProcessLevelClickEvent(it: any, val: any) {
+  fileProcessLevelClickEvent(it: any) {
     this.clearData();
     this.back!.style.visibility = 'visible';
     this.fileStatisticsAnalysisTableProcess!.style.display = 'none';
     this.fileStatisticsAnalysisTableType!.style.display = 'grid';
     this.fileStatisticsAnalysisTableProcess!.setAttribute('hideDownload', '');
     this.fileStatisticsAnalysisTableType?.removeAttribute('hideDownload');
-    this.getFilesystemType(it, val);
+    this.getFilesystemType(it);
     // @ts-ignore
     this.fileStatisticsAnalysisProcessName = it.tableName;
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = this.fileStatisticsAnalysisProcessName;
     this.fileStatisticsAnalysisPie?.hideTip();
   }
-  typePieChart(val: any) {
+  typePieChart() {
     this.fileStatisticsAnalysisPie!.config = {
       appendPadding: 0,
       data: this.fileStatisticsAnalysisTypeData,
@@ -244,7 +250,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
                                 `;
       },
       angleClick: (it) => {
-        this.fileTypeLevelClickEvent(it, val);
+        this.fileTypeLevelClickEvent(it);
       },
       hoverHandler: (data) => {
         if (data) {
@@ -259,12 +265,14 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.fileStatisticsAnalysisTableType!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let fsaData = evt.detail.data;
+    this.fileStatisticsAnalysisTableType!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let typeData = evt.detail;
+      if (typeData.data) {
+        let fsaData = typeData.data;
         fsaData.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (typeData.callBack) {
+          typeData.callBack(true);
         }
       }
       this.fileStatisticsAnalysisPie?.showHover();
@@ -282,27 +290,29 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.fileStatisticsAnalysisTableType!.addEventListener('row-click', (evt: any) => {
+    this.fileStatisticsAnalysisTableType!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.duration !== 0) {
-        this.fileTypeLevelClickEvent(data, val);
+        this.fileTypeLevelClickEvent(data);
       }
     });
   }
-  fileTypeLevelClickEvent(it: any, val: any) {
+  fileTypeLevelClickEvent(it: any) {
     this.clearData();
     this.fileStatisticsAnalysisTableType!.style.display = 'none';
     this.fileStatisticsAnalysisTableThread!.style.display = 'grid';
     this.fileStatisticsAnalysisTableType!.setAttribute('hideDownload', '');
     this.fileStatisticsAnalysisTableThread?.removeAttribute('hideDownload');
-    this.getFilesystemThread(it, val);
+    this.getFilesystemThread(it);
     // @ts-ignore
     this.typeName = it.tableName;
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent =
       this.fileStatisticsAnalysisProcessName + ' / ' + this.typeName;
     this.fileStatisticsAnalysisPie?.hideTip();
   }
-  threadPieChart(val: any) {
+  threadPieChart() {
+    // @ts-ignore
     this.sumDur = this.threadStatisticsData.allDuration;
     this.fileStatisticsAnalysisPie!.config = {
       appendPadding: 0,
@@ -324,7 +334,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
       angleClick: (it) => {
         // @ts-ignore
         if (it.tableName != 'other') {
-          this.fileThreadLevelClickEvent(it, val);
+          this.fileThreadLevelClickEvent(it);
         }
       },
       hoverHandler: (data) => {
@@ -340,12 +350,14 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.fileStatisticsAnalysisTableThread!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let tableData = evt.detail.data;
+    this.fileStatisticsAnalysisTableThread!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let threadData = evt.detail;
+      if (threadData.data) {
+        let tableData = threadData.data;
         tableData.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (threadData.callBack) {
+          threadData.callBack(true);
         }
       }
       this.fileStatisticsAnalysisPie?.showHover();
@@ -364,28 +376,30 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.fileStatisticsAnalysisTableThread!.addEventListener('row-click', (evt: any) => {
+    this.fileStatisticsAnalysisTableThread!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.duration !== 0) {
-        this.fileThreadLevelClickEvent(data, val);
+        this.fileThreadLevelClickEvent(data);
       }
     });
   }
-  fileThreadLevelClickEvent(it: any, val: any) {
+  fileThreadLevelClickEvent(it: any) {
     this.clearData();
     this.back!.style.visibility = 'visible';
     this.fileStatisticsAnalysisTableThread!.style.display = 'none';
     this.fileStatisticsAnalysisTableSo!.style.display = 'grid';
     this.fileStatisticsAnalysisTableThread!.setAttribute('hideDownload', '');
     this.fileStatisticsAnalysisTableSo?.removeAttribute('hideDownload');
-    this.getFilesystemSo(it, val);
+    this.getFilesystemSo(it);
     // @ts-ignore
     this.fileStatisticsAnalysisThreadName = it.tableName;
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent =
       this.fileStatisticsAnalysisProcessName + ' / ' + this.typeName + ' / ' + this.fileStatisticsAnalysisThreadName;
     this.fileStatisticsAnalysisPie?.hideTip();
   }
-  libraryPieChart(val: any) {
+  libraryPieChart() {
+    // @ts-ignore
     this.sumDur = this.libStatisticsData.allDuration;
     this.fileStatisticsAnalysisPie!.config = {
       appendPadding: 0,
@@ -407,7 +421,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
       angleClick: (it) => {
         // @ts-ignore
         if (it.tableName != 'other') {
-          this.fileSoLevelClickEvent(it, val);
+          this.fileSoLevelClickEvent(it);
         }
       },
       hoverHandler: (data) => {
@@ -423,12 +437,14 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.fileStatisticsAnalysisTableSo!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let fsSoData = evt.detail.data;
+    this.fileStatisticsAnalysisTableSo!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let soData = evt.detail;
+      if (soData.data) {
+        let fsSoData = soData.data;
         fsSoData.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (soData.callBack) {
+          soData.callBack(true);
         }
       }
       this.fileStatisticsAnalysisPie?.showHover();
@@ -447,21 +463,22 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.fileStatisticsAnalysisTableSo!.addEventListener('row-click', (evt: any) => {
+    this.fileStatisticsAnalysisTableSo!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.duration !== 0) {
-        this.fileSoLevelClickEvent(data, val);
+        this.fileSoLevelClickEvent(data);
       }
     });
   }
-  fileSoLevelClickEvent(it: any, val: any) {
+  fileSoLevelClickEvent(it: any) {
     this.clearData();
     this.back!.style.visibility = 'visible';
     this.fileStatisticsAnalysisTableSo!.style.display = 'none';
     this.fileStatisticsAnalysisTableFunction!.style.display = 'grid';
     this.fileStatisticsAnalysisTableSo!.setAttribute('hideDownload', '');
     this.fileStatisticsAnalysisTableFunction?.removeAttribute('hideDownload');
-    this.getFilesystemFunction(it, val);
+    this.getFilesystemFunction(it);
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent =
       // @ts-ignore
       this.fileStatisticsAnalysisProcessName +
@@ -564,22 +581,22 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
       fsaCurrentTable!.recycleDataSource = fsaArr;
     }
   }
-  getFilesystemProcess(val: any, result: Array<any>) {
+  getFilesystemProcess(result: Array<any>) {
     this.fileStatisticsAnalysisProcessData = JSON.parse(JSON.stringify(result));
     if (!this.fileStatisticsAnalysisProcessData || this.fileStatisticsAnalysisProcessData.length === 0) {
       this.fileStatisticsAnalysisPidData = [];
       this.processStatisticsData = [];
-      this.processPieChart(val);
+      this.processPieChart();
       return;
     }
     let allDur = 0;
-    let pidMap = new Map<string, Array<any>>();
+    let pidMap = new Map<string, Array<number | string>>();
     for (let itemData of result) {
       allDur += itemData.dur;
       if (pidMap.has(itemData.pid)) {
         pidMap.get(itemData.pid)?.push(itemData);
       } else {
-        let itemArray = new Array<any>();
+        let itemArray = new Array<number | string>();
         itemArray.push(itemData);
         pidMap.set(itemData.pid, itemArray);
       }
@@ -608,21 +625,26 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
     this.processStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 0;
     this.fileStatisticsAnalysisProgressEL!.loading = false;
-    this.processPieChart(val);
+    this.processPieChart();
     new ResizeObserver(() => {
       if (this.parentElement?.clientHeight != 0) {
-        this.fileStatisticsAnalysisTableProcess!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.fileStatisticsAnalysisTableThread!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.fileStatisticsAnalysisTableSo!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.fileStatisticsAnalysisTableFunction!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.fileStatisticsAnalysisTableType!.style.height = this.parentElement!.clientHeight - 40 + 'px';
+        this.fileStatisticsAnalysisTableProcess!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.fileStatisticsAnalysisTableProcess?.reMeauseHeight();
+        this.fileStatisticsAnalysisTableThread!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.fileStatisticsAnalysisTableThread?.reMeauseHeight();
+        this.fileStatisticsAnalysisTableSo!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.fileStatisticsAnalysisTableSo?.reMeauseHeight();
+        this.fileStatisticsAnalysisTableFunction!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.fileStatisticsAnalysisTableFunction?.reMeauseHeight();
+        this.fileStatisticsAnalysisTableType!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.fileStatisticsAnalysisTableType?.reMeauseHeight();
       }
     }).observe(this.parentElement!);
   }
 
-  getFilesystemType(item: any, val: any) {
+  getFilesystemType(item: any) {
     this.fileStatisticsAnalysisProgressEL!.loading = true;
-    let typeMap = new Map<string, Array<any>>();
+    let typeMap = new Map<number, Array<number | string>>();
     let pid = item.pid;
     let allDur = 0;
     if (!this.fileStatisticsAnalysisProcessData || this.fileStatisticsAnalysisProcessData.length == 0) {
@@ -636,13 +658,13 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
       if (typeMap.has(fsItem.type)) {
         typeMap.get(fsItem.type)?.push(fsItem);
       } else {
-        let itemArray = new Array<any>();
+        let itemArray = new Array<number | string>();
         itemArray.push(fsItem);
         typeMap.set(fsItem.type, itemArray);
       }
     }
     this.fileStatisticsAnalysisTypeData = [];
-    typeMap.forEach((value: Array<any>, key: string) => {
+    typeMap.forEach((value: Array<any>, key: number) => {
       let dur = 0;
       for (let item of value) {
         dur += item.dur;
@@ -660,13 +682,13 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
     this.fileStatisticsAnalysisTypeData.sort((a, b) => b.duration - a.duration);
     this.typeStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 1;
-    this.typePieChart(val);
+    this.typePieChart();
     this.fileStatisticsAnalysisProgressEL!.loading = false;
   }
 
-  getFilesystemThread(item: any, val: any) {
+  getFilesystemThread(item: any) {
     this.fileStatisticsAnalysisProgressEL!.loading = true;
-    let threadMap = new Map<string, Array<any>>();
+    let threadMap = new Map<string, Array<number | string>>();
     let pid = item.pid;
     let type = item.type;
     let allDur = 0;
@@ -681,7 +703,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
       if (threadMap.has(fspItem.tid)) {
         threadMap.get(fspItem.tid)?.push(fspItem);
       } else {
-        let itemArray = new Array<any>();
+        let itemArray = new Array<number | string>();
         itemArray.push(fspItem);
         threadMap.set(fspItem.tid, itemArray);
       }
@@ -710,16 +732,16 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
     this.threadStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 2;
     this.fileStatisticsAnalysisProgressEL!.loading = false;
-    this.threadPieChart(val);
+    this.threadPieChart();
   }
 
-  getFilesystemSo(item: any, val: any) {
+  getFilesystemSo(item: any) {
     this.fileStatisticsAnalysisProgressEL!.loading = true;
     let tid = item.tid;
     let pid = item.pid;
     let type = item.type;
     let allDur = 0;
-    let libMap = new Map<number, Array<any>>();
+    let libMap = new Map<number, Array<number | string>>();
     if (!this.fileStatisticsAnalysisProcessData || this.fileStatisticsAnalysisProcessData.length === 0) {
       return;
     }
@@ -731,7 +753,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
       if (libMap.has(itemData.libId)) {
         libMap.get(itemData.libId)?.push(itemData);
       } else {
-        let dataArray = new Array<any>();
+        let dataArray = new Array<number | string>();
         dataArray.push(itemData);
         libMap.set(itemData.libId, dataArray);
       }
@@ -767,10 +789,10 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
     this.libStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 3;
     this.fileStatisticsAnalysisProgressEL!.loading = false;
-    this.libraryPieChart(val);
+    this.libraryPieChart();
   }
 
-  getFilesystemFunction(item: any, val: any) {
+  getFilesystemFunction(item: any) {
     this.fileStatisticsAnalysisProgressEL!.loading = true;
     this.shadowRoot!.querySelector<HTMLDivElement>('.subheading')!.textContent = 'Statistic By Function AllDuration';
     let tid = item.tid;
@@ -795,7 +817,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
       if (symbolMap.has(fsProcessData.symbolId)) {
         symbolMap.get(fsProcessData.symbolId)?.push(fsProcessData);
       } else {
-        let dataArray = new Array<any>();
+        let dataArray = new Array<number | string>();
         dataArray.push(fsProcessData);
         symbolMap.set(fsProcessData.symbolId, dataArray);
       }
@@ -826,6 +848,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
     this.functionStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 4;
     this.fileStatisticsAnalysisProgressEL!.loading = false;
+    // @ts-ignore
     this.sumDur = this.functionStatisticsData.allDuration;
     this.fileStatisticsAnalysisPie!.config = {
       appendPadding: 0,
@@ -857,12 +880,14 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.fileStatisticsAnalysisTableFunction!.addEventListener('row-hover', (fsStatRowClickEvent: any) => {
-      if (fsStatRowClickEvent.detail.data) {
-        let data = fsStatRowClickEvent.detail.data;
+    this.fileStatisticsAnalysisTableFunction!.addEventListener('row-hover', (fsStatRowClickEvent) => {
+      // @ts-ignore
+      let fsFunctionData = fsStatRowClickEvent.detail;
+      if (fsFunctionData.data) {
+        let data = fsFunctionData.data;
         data.isHover = true;
-        if ((fsStatRowClickEvent.detail as any).callBack) {
-          (fsStatRowClickEvent.detail as any).callBack(true);
+        if (fsFunctionData.callBack) {
+          fsFunctionData.callBack(true);
         }
       }
       this.fileStatisticsAnalysisPie?.showHover();
@@ -879,8 +904,8 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
   }
-  typeIdToString(transformType: any) {
-    let releaseType: any;
+  typeIdToString(transformType: number) {
+    let releaseType: string;
     if (transformType === 0) {
       releaseType = 'OPEN';
     } else if (transformType === 2) {
@@ -890,9 +915,10 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
     } else if (transformType === 1) {
       releaseType = 'CLOSE';
     }
+    // @ts-ignore
     return releaseType;
   }
-  totalDurationData(duration: any) {
+  totalDurationData(duration: number) {
     let allDuration;
     allDuration = {
       durFormat: Utils.getProbablyTime(duration),
@@ -904,7 +930,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement {
   }
   getPieChartData(pieChartData: any[]) {
     if (pieChartData.length > 20) {
-      let pieChartArr: any[] = [];
+      let pieChartArr: string[] = [];
       let other: any = {
         tableName: 'other',
         duration: 0,
diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.ts
index 2e33eeb2d1a7a4630b8dc9742a1c377d196da850..8c01e3c80a96513e80a614f827be83f8cc502c83 100644
--- a/ide/src/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.ts
+++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.ts
@@ -25,7 +25,7 @@ import { procedurePool } from '../../../../database/Procedure.js';
 @element('tabpane-tb-vm-statistics')
 export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
   private iOTierStatisticsAnalysisPie: LitChartPie | null | undefined;
-  private currentSelection: SelectionParam | any;
+  private currentSelection: SelectionParam | null | undefined;
   private processData: any;
   private pidData!: any[];
   private threadData!: any[];
@@ -37,7 +37,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
   private tableType: LitTable | null | undefined;
   private tableSo: LitTable | null | undefined;
   private tableFunction: LitTable | null | undefined;
-  private sumDur: any;
+  private sumDur: number = 0;
   private range: HTMLLabelElement | null | undefined;
   private iOTierStatisticsAnalysisBack: HTMLDivElement | null | undefined;
   private tabName: HTMLDivElement | null | undefined;
@@ -46,15 +46,15 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
   private threadName: string = '';
   private sortColumn: string = '';
   private sortType: number = 0;
-  private typeName: any;
+  private typeName: string = '';
   private currentLevel = -1;
   private currentLevelData!: Array<any>;
-  private processStatisticsData!: any;
-  private typeStatisticsData!: any;
-  private threadStatisticsData!: any;
-  private libStatisticsData!: any;
-  private functionStatisticsData!: any;
-  set data(ioTierStatisticsAnalysisSelection: SelectionParam | any) {
+  private processStatisticsData!: {};
+  private typeStatisticsData!: {};
+  private threadStatisticsData!: {};
+  private libStatisticsData!: {};
+  private functionStatisticsData!: {};
+  set data(ioTierStatisticsAnalysisSelection: SelectionParam) {
     if (ioTierStatisticsAnalysisSelection === this.currentSelection) {
       this.pidData.unshift(this.processStatisticsData);
       this.tableProcess!.recycleDataSource = this.pidData;
@@ -70,6 +70,8 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
     this.tableSo!.style.display = 'none';
     this.tableFunction!.style.display = 'none';
     this.iOTierStatisticsAnalysisBack!.style.visibility = 'hidden';
+    this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = '';
+    this.tabName!.textContent = '';
     this.range!.textContent =
       'Selected range: ' +
       parseFloat(
@@ -89,7 +91,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
         },
       ],
       (results: any[]) => {
-        this.getIOTierProcess(ioTierStatisticsAnalysisSelection, results);
+        this.getIOTierProcess(results);
       }
     );
   }
@@ -123,32 +125,33 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
         this.tableType!.setAttribute('hideDownload', '');
         this.tableProcess?.removeAttribute('hideDownload');
         this.currentLevel = 0;
-        this.processPieChart(this.currentSelection);
+        this.processPieChart();
       } else if (this.tabName!.textContent === 'Statistic By Thread AllDuration') {
         this.tableType!.style.display = 'grid';
         this.tableThread!.style.display = 'none';
         this.tableThread!.setAttribute('hideDownload', '');
         this.tableType?.removeAttribute('hideDownload');
         this.currentLevel = 1;
-        this.typePieChart(this.currentSelection);
+        this.typePieChart();
       } else if (this.tabName!.textContent === 'Statistic By Library AllDuration') {
         this.tableThread!.style.display = 'grid';
         this.tableSo!.style.display = 'none';
         this.tableSo!.setAttribute('hideDownload', '');
         this.tableThread?.removeAttribute('hideDownload');
         this.currentLevel = 2;
-        this.threadPieChart(this.currentSelection);
+        this.threadPieChart();
       } else if (this.tabName!.textContent === 'Statistic By Function AllDuration') {
         this.tableSo!.style.display = 'grid';
         this.tableFunction!.style.display = 'none';
         this.tableFunction!.setAttribute('hideDownload', '');
         this.tableSo?.removeAttribute('hideDownload');
         this.currentLevel = 3;
-        this.libraryPieChart(this.currentSelection);
+        this.libraryPieChart();
       }
     });
   }
-  processPieChart(val: any) {
+  processPieChart() {
+    // @ts-ignore
     this.sumDur = this.processStatisticsData.allDuration;
     this.iOTierStatisticsAnalysisPie!.config = {
       appendPadding: 0,
@@ -170,7 +173,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
       angleClick: (it) => {
         // @ts-ignore
         if (it.tableName != 'other') {
-          this.ioTierProcessLevelClickEvent(it, val);
+          this.ioTierProcessLevelClickEvent(it);
         }
       },
       hoverHandler: (data) => {
@@ -186,12 +189,14 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.tableProcess!.addEventListener('row-hover', (event: any) => {
-      if (event.detail.data) {
-        let processData = event.detail.data;
+    this.tableProcess!.addEventListener('row-hover', (event) => {
+      // @ts-ignore
+      let ioProcessData = event.detail;
+      if (ioProcessData.data) {
+        let processData = ioProcessData.data;
         processData.isHover = true;
-        if ((event.detail as any).callBack) {
-          (event.detail as any).callBack(true);
+        if (ioProcessData.callBack) {
+          ioProcessData.callBack(true);
         }
       }
       this.iOTierStatisticsAnalysisPie?.showHover();
@@ -209,26 +214,27 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.tableProcess!.addEventListener('row-click', (evt: any) => {
+    this.tableProcess!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.duration !== 0) {
-        this.ioTierProcessLevelClickEvent(data, val);
+        this.ioTierProcessLevelClickEvent(data);
       }
     });
   }
-  ioTierProcessLevelClickEvent(it: any, val: any) {
+  ioTierProcessLevelClickEvent(it: any) {
     this.clearData();
     this.iOTierStatisticsAnalysisBack!.style.visibility = 'visible';
     this.tableProcess!.style.display = 'none';
     this.tableType!.style.display = 'grid';
     this.tableProcess!.setAttribute('hideDownload', '');
     this.tableType?.removeAttribute('hideDownload');
-    this.getIOTierType(it, val);
+    this.getIOTierType(it);
     this.processName = it.tableName;
     this.iOTierStatisticsAnalysisPie?.hideTip();
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = this.processName;
   }
-  typePieChart(val: any) {
+  typePieChart() {
     this.iOTierStatisticsAnalysisPie!.config = {
       appendPadding: 0,
       data: this.typeData,
@@ -247,7 +253,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
                                 `;
       },
       angleClick: (it) => {
-        this.ioTierTypeLevelClickEvent(it, val);
+        this.ioTierTypeLevelClickEvent(it);
       },
       hoverHandler: (data) => {
         if (data) {
@@ -262,12 +268,14 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.tableType!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let tableData = evt.detail.data;
+    this.tableType!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let ioTypeData = evt.detail;
+      if (ioTypeData.data) {
+        let tableData = ioTypeData.data;
         tableData.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (ioTypeData.callBack) {
+          ioTypeData.callBack(true);
         }
       }
       this.iOTierStatisticsAnalysisPie?.showHover();
@@ -285,25 +293,27 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.tableType!.addEventListener('row-click', (evt: any) => {
+    this.tableType!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.duration !== 0) {
-        this.ioTierTypeLevelClickEvent(data, val);
+        this.ioTierTypeLevelClickEvent(data);
       }
     });
   }
-  ioTierTypeLevelClickEvent(it: any, val: any) {
+  ioTierTypeLevelClickEvent(it: any) {
     this.clearData();
     this.tableType!.style.display = 'none';
     this.tableThread!.style.display = 'grid';
     this.tableType!.setAttribute('hideDownload', '');
     this.tableThread?.removeAttribute('hideDownload');
-    this.getIOTierThread(it, val);
+    this.getIOTierThread(it);
     this.typeName = it.tableName;
     this.iOTierStatisticsAnalysisPie?.hideTip();
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = this.processName + ' / ' + this.typeName;
   }
-  threadPieChart(val: any) {
+  threadPieChart() {
+    // @ts-ignore
     this.sumDur = this.threadStatisticsData.allDuration;
     this.iOTierStatisticsAnalysisPie!.config = {
       appendPadding: 0,
@@ -325,7 +335,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
       angleClick: (it) => {
         // @ts-ignore
         if (it.tableName != 'other') {
-          this.ioTierThreadLevelClickEvent(it, val);
+          this.ioTierThreadLevelClickEvent(it);
         }
       },
       hoverHandler: (data) => {
@@ -341,12 +351,14 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.tableThread!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let threadData = evt.detail.data;
+    this.tableThread!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let ioThreadData = evt.detail;
+      if (ioThreadData.data) {
+        let threadData = ioThreadData.data;
         threadData.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (ioThreadData.callBack) {
+          ioThreadData.callBack(true);
         }
       }
       this.iOTierStatisticsAnalysisPie?.showHover();
@@ -364,27 +376,29 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.tableThread!.addEventListener('row-click', (evt: any) => {
+    this.tableThread!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.duration !== 0) {
-        this.ioTierThreadLevelClickEvent(data, val);
+        this.ioTierThreadLevelClickEvent(data);
       }
     });
   }
-  ioTierThreadLevelClickEvent(it: any, val: any) {
+  ioTierThreadLevelClickEvent(it: any) {
     this.clearData();
     this.iOTierStatisticsAnalysisBack!.style.visibility = 'visible';
     this.tableThread!.style.display = 'none';
     this.tableSo!.style.display = 'grid';
     this.tableThread!.setAttribute('hideDownload', '');
     this.tableSo?.removeAttribute('hideDownload');
-    this.getIOTierSo(it, val);
+    this.getIOTierSo(it);
     this.threadName = it.tableName;
     this.iOTierStatisticsAnalysisPie?.hideTip();
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent =
       this.processName + ' / ' + this.typeName + ' / ' + this.threadName;
   }
-  libraryPieChart(val: any) {
+  libraryPieChart() {
+    // @ts-ignore
     this.sumDur = this.libStatisticsData.allDuration;
     this.iOTierStatisticsAnalysisPie!.config = {
       appendPadding: 0,
@@ -406,7 +420,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
       angleClick: (it) => {
         // @ts-ignore
         if (it.tableName != 'other') {
-          this.ioTierSoLevelClickEvent(it, val);
+          this.ioTierSoLevelClickEvent(it);
         }
       },
       hoverHandler: (data) => {
@@ -422,12 +436,14 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.tableSo!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let soData = evt.detail.data;
+    this.tableSo!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let ioSoData = evt.detail;
+      if (ioSoData.data) {
+        let soData = ioSoData.data;
         soData.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (ioSoData.callBack) {
+          ioSoData.callBack(true);
         }
       }
       this.iOTierStatisticsAnalysisPie?.showHover();
@@ -446,21 +462,22 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.tableSo!.addEventListener('row-click', (evt: any) => {
+    this.tableSo!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.duration !== 0) {
-        this.ioTierSoLevelClickEvent(data, val);
+        this.ioTierSoLevelClickEvent(data);
       }
     });
   }
-  ioTierSoLevelClickEvent(it: any, val: any) {
+  ioTierSoLevelClickEvent(it: any) {
     this.clearData();
     this.iOTierStatisticsAnalysisBack!.style.visibility = 'visible';
     this.tableSo!.style.display = 'none';
     this.tableFunction!.style.display = 'grid';
     this.tableSo!.setAttribute('hideDownload', '');
     this.tableFunction?.removeAttribute('hideDownload');
-    this.getIOTierFunction(it, val);
+    this.getIOTierFunction(it);
     this.iOTierStatisticsAnalysisPie?.hideTip();
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent =
       this.processName + ' / ' + this.typeName + ' / ' + this.threadName + ' / ' + it.tableName;
@@ -556,22 +573,22 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
       currentTable!.recycleDataSource = ioArr;
     }
   }
-  getIOTierProcess(val: any, result: Array<any>) {
+  getIOTierProcess(result: Array<any>) {
     this.processData = JSON.parse(JSON.stringify(result));
     if (!this.processData || this.processData.length === 0) {
       this.pidData = [];
       this.processStatisticsData = [];
-      this.processPieChart(val);
+      this.processPieChart();
       return;
     }
     let allDur = 0;
-    let ioMap = new Map<string, Array<any>>();
+    let ioMap = new Map<string, Array<number | string>>();
     for (let itemData of result) {
       allDur += itemData.dur;
       if (ioMap.has(itemData.pid)) {
         ioMap.get(itemData.pid)?.push(itemData);
       } else {
-        let itemArray = new Array<any>();
+        let itemArray = new Array<number | string>();
         itemArray.push(itemData);
         ioMap.set(itemData.pid, itemArray);
       }
@@ -600,20 +617,25 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
     this.processStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 0;
     this.progressEL!.loading = false;
-    this.processPieChart(val);
+    this.processPieChart();
     new ResizeObserver(() => {
       if (this.parentElement?.clientHeight != 0) {
-        this.tableProcess!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.tableThread!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.tableSo!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.tableFunction!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.tableType!.style.height = this.parentElement!.clientHeight - 40 + 'px';
+        this.tableProcess!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.tableProcess?.reMeauseHeight();
+        this.tableThread!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.tableThread?.reMeauseHeight();
+        this.tableSo!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.tableSo?.reMeauseHeight();
+        this.tableFunction!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.tableFunction?.reMeauseHeight();
+        this.tableType!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.tableType?.reMeauseHeight();
       }
     }).observe(this.parentElement!);
   }
-  getIOTierType(item: any, val: any) {
+  getIOTierType(item: any) {
     this.progressEL!.loading = true;
-    let typeMap = new Map<string, Array<any>>();
+    let typeMap = new Map<number, Array<number | string>>();
     let pid = item.pid;
     let allDur = 0;
     if (!this.processData || this.processData.length === 0) {
@@ -627,13 +649,13 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
       if (typeMap.has(processItem.type)) {
         typeMap.get(processItem.type)?.push(processItem);
       } else {
-        let itemArray = new Array<any>();
+        let itemArray = new Array<number | string>();
         itemArray.push(processItem);
         typeMap.set(processItem.type, itemArray);
       }
     }
     this.typeData = [];
-    typeMap.forEach((value: Array<any>, key: string) => {
+    typeMap.forEach((value: Array<any>, key: number) => {
       let dur = 0;
       for (let item of value) {
         dur += item.dur;
@@ -651,12 +673,12 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
     this.typeData.sort((a, b) => b.duration - a.duration);
     this.typeStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 1;
-    this.typePieChart(val);
+    this.typePieChart();
     this.progressEL!.loading = false;
   }
-  getIOTierThread(item: any, val: any) {
+  getIOTierThread(item: any) {
     this.progressEL!.loading = true;
-    let threadMap = new Map<string, Array<any>>();
+    let threadMap = new Map<string, Array<number | string>>();
     let pid = item.pid;
     let type = item.type;
     let allDur = 0;
@@ -671,7 +693,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
       if (threadMap.has(itemData.tid)) {
         threadMap.get(itemData.tid)?.push(itemData);
       } else {
-        let itemArray = new Array<any>();
+        let itemArray = new Array<number | string>();
         itemArray.push(itemData);
         threadMap.set(itemData.tid, itemArray);
       }
@@ -700,15 +722,15 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
     this.threadStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 2;
     this.progressEL!.loading = false;
-    this.threadPieChart(val);
+    this.threadPieChart();
   }
-  getIOTierSo(item: any, val: any) {
+  getIOTierSo(item: any) {
     this.progressEL!.loading = true;
     let tid = item.tid;
     let pid = item.pid;
     let type = item.type;
     let allDur = 0;
-    let libMap = new Map<number, Array<any>>();
+    let libMap = new Map<number, Array<number | string>>();
     if (!this.processData || this.processData.length === 0) {
       return;
     }
@@ -720,7 +742,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
       if (libMap.has(processItemData.libId)) {
         libMap.get(processItemData.libId)?.push(processItemData);
       } else {
-        let dataArray = new Array<any>();
+        let dataArray = new Array<number | string>();
         dataArray.push(processItemData);
         libMap.set(processItemData.libId, dataArray);
       }
@@ -756,9 +778,9 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
     this.libStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 3;
     this.progressEL!.loading = false;
-    this.libraryPieChart(val);
+    this.libraryPieChart();
   }
-  getIOTierFunction(item: any, val: any) {
+  getIOTierFunction(item: any) {
     this.progressEL!.loading = true;
     this.shadowRoot!.querySelector<HTMLDivElement>('.subheading')!.textContent = 'Statistic By Function AllDuration';
     let tid = item.tid;
@@ -783,7 +805,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
       if (symbolMap.has(processData.symbolId)) {
         symbolMap.get(processData.symbolId)?.push(processData);
       } else {
-        let dataArray = new Array<any>();
+        let dataArray = new Array<number | string>();
         dataArray.push(processData);
         symbolMap.set(processData.symbolId, dataArray);
       }
@@ -814,6 +836,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
     this.functionStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 4;
     this.progressEL!.loading = false;
+    // @ts-ignore
     this.sumDur = this.functionStatisticsData.allDuration;
     this.iOTierStatisticsAnalysisPie!.config = {
       appendPadding: 0,
@@ -845,12 +868,14 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.tableFunction!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let funData = evt.detail.data;
+    this.tableFunction!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let ioFunctionData = evt.detail;
+      if (ioFunctionData.data) {
+        let funData = ioFunctionData.data;
         funData.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (ioFunctionData.callBack) {
+          ioFunctionData.callBack(true);
         }
       }
       this.iOTierStatisticsAnalysisPie?.showHover();
@@ -867,8 +892,8 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
   }
-  typeIdToString(type: any) {
-    let releaseType: any;
+  typeIdToString(type: number) {
+    let releaseType: string;
     if (type === 1) {
       releaseType = 'DATA_READ';
     } else if (type === 2) {
@@ -878,9 +903,10 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
     } else if (type === 4) {
       releaseType = 'METADATA_WRITE';
     }
+    // @ts-ignore
     return releaseType;
   }
-  totalDurationData(duration: any) {
+  totalDurationData(duration: number) {
     let allDuration;
     allDuration = {
       durFormat: Utils.getProbablyTime(duration),
@@ -893,7 +919,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement {
   }
   getPieChartData(res: any[]) {
     if (res.length > 20) {
-      let pieChartArr: any[] = [];
+      let pieChartArr: string[] = [];
       let other: any = {
         tableName: 'other',
         duration: 0,
diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts
index 743e59a459078a8f580e5e32099d9e123199e9e1..3348318ca8268313bd9e758186654e4a027cf7f8 100644
--- a/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts
+++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts
@@ -25,7 +25,7 @@ import { procedurePool } from '../../../../database/Procedure.js';
 @element('tabpane-virtual-memory-statistics-analysis')
 export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
   private vmStatisticsAnalysisPie: LitChartPie | null | undefined;
-  private vmStatisticsAnalysisCurrentSelection: SelectionParam | any;
+  private vmStatisticsAnalysisCurrentSelection: SelectionParam | null | undefined;
   private vmStatisticsAnalysisProcessData: any;
   private vmStatisticsAnalysisPidData!: any[];
   private vmStatisticsAnalysisThreadData!: any[];
@@ -37,7 +37,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
   private vmStatisticsAnalysisTableThread: LitTable | null | undefined;
   private vmStatisticsAnalysisTableSo: LitTable | null | undefined;
   private vmStatisticsAnalysisTableFunction: LitTable | null | undefined;
-  private sumDur: any;
+  private sumDur: number = 0;
   private vmStatisticsAnalysisRange: HTMLLabelElement | null | undefined;
   private back: HTMLDivElement | null | undefined;
   private tabName: HTMLDivElement | null | undefined;
@@ -49,12 +49,12 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
   private vmStatisticsAnalysisSortType: number = 0;
   private currentLevel = -1;
   private currentLevelData!: Array<any>;
-  private processStatisticsData!: any;
-  private typeStatisticsData!: any;
-  private threadStatisticsData!: any;
-  private libStatisticsData!: any;
-  private functionStatisticsData!: any;
-  set data(vmStatisticsAnalysisSelection: SelectionParam | any) {
+  private processStatisticsData!: {};
+  private typeStatisticsData!: {};
+  private threadStatisticsData!: {};
+  private libStatisticsData!: {};
+  private functionStatisticsData!: {};
+  set data(vmStatisticsAnalysisSelection: SelectionParam) {
     if (vmStatisticsAnalysisSelection === this.vmStatisticsAnalysisCurrentSelection) {
       this.vmStatisticsAnalysisPidData.unshift(this.processStatisticsData);
       this.vmStatisticsAnalysisTableProcess!.recycleDataSource = this.vmStatisticsAnalysisPidData;
@@ -70,6 +70,8 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
     this.vmStatisticsAnalysisTableSo!.style.display = 'none';
     this.vmStatisticsAnalysisTableFunction!.style.display = 'none';
     this.back!.style.visibility = 'hidden';
+    this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = '';
+    this.tabName!.textContent = '';
     this.vmStatisticsAnalysisRange!.textContent =
       'Selected range: ' +
       parseFloat(
@@ -89,7 +91,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
         },
       ],
       (results: any[]) => {
-        this.getVirtualMemoryProcess(vmStatisticsAnalysisSelection, results);
+        this.getVirtualMemoryProcess(results);
       }
     );
   }
@@ -123,32 +125,33 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
         this.vmStatisticsAnalysisTableType!.setAttribute('hideDownload', '');
         this.vmStatisticsAnalysisTableProcess?.removeAttribute('hideDownload');
         this.currentLevel = 0;
-        this.processPieChart(this.vmStatisticsAnalysisCurrentSelection);
+        this.processPieChart();
       } else if (this.tabName!.textContent === 'Statistic By Thread AllDuration') {
         this.vmStatisticsAnalysisTableType!.style.display = 'grid';
         this.vmStatisticsAnalysisTableThread!.style.display = 'none';
         this.vmStatisticsAnalysisTableThread!.setAttribute('hideDownload', '');
         this.vmStatisticsAnalysisTableType?.removeAttribute('hideDownload');
         this.currentLevel = 1;
-        this.typePieChart(this.vmStatisticsAnalysisCurrentSelection);
+        this.typePieChart();
       } else if (this.tabName!.textContent === 'Statistic By Library AllDuration') {
         this.vmStatisticsAnalysisTableThread!.style.display = 'grid';
         this.vmStatisticsAnalysisTableSo!.style.display = 'none';
         this.vmStatisticsAnalysisTableSo!.setAttribute('hideDownload', '');
         this.vmStatisticsAnalysisTableThread?.removeAttribute('hideDownload');
         this.currentLevel = 2;
-        this.threadPieChart(this.vmStatisticsAnalysisCurrentSelection);
+        this.threadPieChart();
       } else if (this.tabName!.textContent === 'Statistic By Function AllDuration') {
         this.vmStatisticsAnalysisTableSo!.style.display = 'grid';
         this.vmStatisticsAnalysisTableFunction!.style.display = 'none';
         this.vmStatisticsAnalysisTableFunction!.setAttribute('hideDownload', '');
         this.vmStatisticsAnalysisTableSo?.removeAttribute('hideDownload');
         this.currentLevel = 3;
-        this.libraryPieChart(this.vmStatisticsAnalysisCurrentSelection);
+        this.libraryPieChart();
       }
     });
   }
-  processPieChart(val: any) {
+  processPieChart() {
+    // @ts-ignore
     this.sumDur = this.processStatisticsData.allDuration;
     this.vmStatisticsAnalysisPie!.config = {
       appendPadding: 0,
@@ -170,7 +173,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
       angleClick: (it) => {
         // @ts-ignore
         if (it.tableName != 'other') {
-          this.vmProcessLevelClickEvent(it, val);
+          this.vmProcessLevelClickEvent(it);
         }
       },
       hoverHandler: (data) => {
@@ -186,12 +189,14 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.vmStatisticsAnalysisTableProcess!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let vmsData = evt.detail.data;
+    this.vmStatisticsAnalysisTableProcess!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let vmProcessData = evt.detail;
+      if (vmProcessData.data) {
+        let vmsData = vmProcessData.data;
         vmsData.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (vmProcessData.callBack) {
+          vmProcessData.callBack(true);
         }
       }
       this.vmStatisticsAnalysisPie?.showHover();
@@ -209,26 +214,27 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.vmStatisticsAnalysisTableProcess!.addEventListener('row-click', (evt: any) => {
+    this.vmStatisticsAnalysisTableProcess!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.duration !== 0) {
-        this.vmProcessLevelClickEvent(data, val);
+        this.vmProcessLevelClickEvent(data);
       }
     });
   }
-  vmProcessLevelClickEvent(it: any, val: any) {
+  vmProcessLevelClickEvent(it: any) {
     this.clearData();
     this.back!.style.visibility = 'visible';
     this.vmStatisticsAnalysisTableProcess!.style.display = 'none';
     this.vmStatisticsAnalysisTableType!.style.display = 'grid';
     this.vmStatisticsAnalysisTableProcess!.setAttribute('hideDownload', '');
     this.vmStatisticsAnalysisTableType?.removeAttribute('hideDownload');
-    this.getVirtualMemoryType(it, val);
+    this.getVirtualMemoryType(it);
     this.processName = it.tableName;
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = this.processName;
     this.vmStatisticsAnalysisPie?.hideTip();
   }
-  typePieChart(val: any) {
+  typePieChart() {
     this.vmStatisticsAnalysisPie!.config = {
       appendPadding: 0,
       data: this.vmStatisticsAnalysisTypeData,
@@ -247,7 +253,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
                                 `;
       },
       angleClick: (it) => {
-        this.vmTypeLevelClickEvent(it, val);
+        this.vmTypeLevelClickEvent(it);
       },
       hoverHandler: (data) => {
         if (data) {
@@ -262,12 +268,14 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.vmStatisticsAnalysisTableType!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let satData = evt.detail.data;
+    this.vmStatisticsAnalysisTableType!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let vmTypeData = evt.detail;
+      if (vmTypeData.data) {
+        let satData = vmTypeData.data;
         satData.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (vmTypeData.callBack) {
+          vmTypeData.callBack(true);
         }
       }
       this.vmStatisticsAnalysisPie?.showHover();
@@ -285,25 +293,27 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.vmStatisticsAnalysisTableType!.addEventListener('row-click', (evt: any) => {
+    this.vmStatisticsAnalysisTableType!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.duration !== 0) {
-        this.vmTypeLevelClickEvent(data, val);
+        this.vmTypeLevelClickEvent(data);
       }
     });
   }
-  vmTypeLevelClickEvent(it: any, val: any) {
+  vmTypeLevelClickEvent(it: any) {
     this.clearData();
     this.vmStatisticsAnalysisTableType!.style.display = 'none';
     this.vmStatisticsAnalysisTableThread!.style.display = 'grid';
     this.vmStatisticsAnalysisTableType!.setAttribute('hideDownload', '');
     this.vmStatisticsAnalysisTableThread?.removeAttribute('hideDownload');
-    this.getVirtualMemoryThread(it, val);
+    this.getVirtualMemoryThread(it);
     this.typeName = it.tableName;
     this.vmStatisticsAnalysisPie?.hideTip();
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = this.processName + ' / ' + this.typeName;
   }
-  threadPieChart(val: any) {
+  threadPieChart() {
+    // @ts-ignore
     this.sumDur = this.threadStatisticsData.allDuration;
     this.vmStatisticsAnalysisPie!.config = {
       appendPadding: 0,
@@ -325,7 +335,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
       angleClick: (it) => {
         // @ts-ignore
         if (it.tableName != 'other') {
-          this.vmThreadLevelClickEvent(it, val);
+          this.vmThreadLevelClickEvent(it);
         }
       },
       hoverHandler: (data) => {
@@ -341,12 +351,14 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.vmStatisticsAnalysisTableThread!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let threadData = evt.detail.data;
+    this.vmStatisticsAnalysisTableThread!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let vmThreadData = evt.detail;
+      if (vmThreadData.data) {
+        let threadData = vmThreadData.data;
         threadData.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (vmThreadData.callBack) {
+          vmThreadData.callBack(true);
         }
       }
       this.vmStatisticsAnalysisPie?.showHover();
@@ -364,27 +376,29 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.vmStatisticsAnalysisTableThread!.addEventListener('row-click', (evt: any) => {
+    this.vmStatisticsAnalysisTableThread!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.duration !== 0) {
-        this.vmThreadLevelClickEvent(data, val);
+        this.vmThreadLevelClickEvent(data);
       }
     });
   }
-  vmThreadLevelClickEvent(it: any, val: any) {
+  vmThreadLevelClickEvent(it: any) {
     this.clearData();
     this.back!.style.visibility = 'visible';
     this.vmStatisticsAnalysisTableThread!.style.display = 'none';
     this.vmStatisticsAnalysisTableSo!.style.display = 'grid';
     this.vmStatisticsAnalysisTableThread!.setAttribute('hideDownload', '');
     this.vmStatisticsAnalysisTableSo?.removeAttribute('hideDownload');
-    this.getVirtualMemorySo(it, val);
+    this.getVirtualMemorySo(it);
     this.threadName = it.tableName;
     this.vmStatisticsAnalysisPie?.hideTip();
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent =
       this.processName + ' / ' + this.typeName + ' / ' + this.threadName;
   }
-  libraryPieChart(val: any) {
+  libraryPieChart() {
+    // @ts-ignore
     this.sumDur = this.libStatisticsData.allDuration;
     this.vmStatisticsAnalysisPie!.config = {
       appendPadding: 0,
@@ -406,7 +420,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
       angleClick: (it) => {
         // @ts-ignore
         if (it.tableName != 'other') {
-          this.vmSoLevelClickEvent(it, val);
+          this.vmSoLevelClickEvent(it);
         }
       },
       hoverHandler: (data) => {
@@ -422,12 +436,14 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.vmStatisticsAnalysisTableSo!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let soData = evt.detail.data;
+    this.vmStatisticsAnalysisTableSo!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let vmSoData = evt.detail;
+      if (vmSoData.data) {
+        let soData = vmSoData.data;
         soData.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (vmSoData.callBack) {
+          vmSoData.callBack(true);
         }
       }
       this.vmStatisticsAnalysisPie?.showHover();
@@ -446,21 +462,22 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.vmStatisticsAnalysisTableSo!.addEventListener('row-click', (evt: any) => {
+    this.vmStatisticsAnalysisTableSo!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.duration !== 0) {
-        this.vmSoLevelClickEvent(data, val);
+        this.vmSoLevelClickEvent(data);
       }
     });
   }
-  vmSoLevelClickEvent(it: any, val: any) {
+  vmSoLevelClickEvent(it: any) {
     this.clearData();
     this.back!.style.visibility = 'visible';
     this.vmStatisticsAnalysisTableSo!.style.display = 'none';
     this.vmStatisticsAnalysisTableFunction!.style.display = 'grid';
     this.vmStatisticsAnalysisTableSo!.setAttribute('hideDownload', '');
     this.vmStatisticsAnalysisTableFunction?.removeAttribute('hideDownload');
-    this.getVirtualMemoryFunction(it, val);
+    this.getVirtualMemoryFunction(it);
     this.vmStatisticsAnalysisPie?.hideTip();
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent =
       this.processName + ' / ' + this.typeName + ' / ' + this.threadName + ' / ' + it.tableName;
@@ -556,23 +573,23 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
       vmsCurrentTable!.recycleDataSource = vmsArr;
     }
   }
-  getVirtualMemoryProcess(val: any, result: Array<any>) {
+  getVirtualMemoryProcess(result: Array<any>) {
     this.vmStatisticsAnalysisProgressEL!.loading = true;
     this.vmStatisticsAnalysisProcessData = JSON.parse(JSON.stringify(result));
     if (!this.vmStatisticsAnalysisProcessData || this.vmStatisticsAnalysisProcessData.length === 0) {
       this.vmStatisticsAnalysisPidData = [];
       this.processStatisticsData = [];
-      this.processPieChart(val);
+      this.processPieChart();
       return;
     }
     let allDur = 0;
-    let vmMap = new Map<string, Array<any>>();
+    let vmMap = new Map<string, Array<number | string>>();
     for (let itemData of result) {
       allDur += itemData.dur;
       if (vmMap.has(itemData.pid)) {
         vmMap.get(itemData.pid)?.push(itemData);
       } else {
-        let itemArray = new Array<any>();
+        let itemArray = new Array<number | string>();
         itemArray.push(itemData);
         vmMap.set(itemData.pid, itemArray);
       }
@@ -601,20 +618,25 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
     this.processStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 0;
     this.vmStatisticsAnalysisProgressEL!.loading = false;
-    this.processPieChart(val);
+    this.processPieChart();
     new ResizeObserver(() => {
       if (this.parentElement?.clientHeight != 0) {
-        this.vmStatisticsAnalysisTableProcess!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.vmStatisticsAnalysisTableType!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.vmStatisticsAnalysisTableThread!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.vmStatisticsAnalysisTableSo!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.vmStatisticsAnalysisTableFunction!.style.height = this.parentElement!.clientHeight - 40 + 'px';
+        this.vmStatisticsAnalysisTableProcess!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.vmStatisticsAnalysisTableProcess?.reMeauseHeight();
+        this.vmStatisticsAnalysisTableType!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.vmStatisticsAnalysisTableType?.reMeauseHeight();
+        this.vmStatisticsAnalysisTableThread!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.vmStatisticsAnalysisTableThread?.reMeauseHeight();
+        this.vmStatisticsAnalysisTableSo!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.vmStatisticsAnalysisTableSo?.reMeauseHeight();
+        this.vmStatisticsAnalysisTableFunction!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.vmStatisticsAnalysisTableFunction?.reMeauseHeight();
       }
     }).observe(this.parentElement!);
   }
-  getVirtualMemoryType(item: any, val: any) {
+  getVirtualMemoryType(item: any) {
     this.vmStatisticsAnalysisProgressEL!.loading = true;
-    let typeMap = new Map<string, Array<any>>();
+    let typeMap = new Map<number, Array<number | string>>();
     let pid = item.pid;
     let allDur = 0;
     if (!this.vmStatisticsAnalysisProcessData || this.vmStatisticsAnalysisProcessData.length === 0) {
@@ -628,13 +650,13 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
       if (typeMap.has(vmsItem.type)) {
         typeMap.get(vmsItem.type)?.push(vmsItem);
       } else {
-        let itemArray = new Array<any>();
+        let itemArray = new Array<number | string>();
         itemArray.push(vmsItem);
         typeMap.set(vmsItem.type, itemArray);
       }
     }
     this.vmStatisticsAnalysisTypeData = [];
-    typeMap.forEach((value: Array<any>, key: string) => {
+    typeMap.forEach((value: Array<any>, key: number) => {
       let dur = 0;
       for (let item of value) {
         dur += item.dur;
@@ -652,12 +674,12 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
     this.vmStatisticsAnalysisTypeData.sort((a, b) => b.duration - a.duration);
     this.typeStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 1;
-    this.typePieChart(val);
+    this.typePieChart();
     this.vmStatisticsAnalysisProgressEL!.loading = false;
   }
-  getVirtualMemoryThread(item: any, val: any) {
+  getVirtualMemoryThread(item: any) {
     this.vmStatisticsAnalysisProgressEL!.loading = true;
-    let threadMap = new Map<string, Array<any>>();
+    let threadMap = new Map<string, Array<number | string>>();
     let pid = item.pid;
     let type = item.type;
     let allDur = 0;
@@ -672,7 +694,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
       if (threadMap.has(vmapItem.tid)) {
         threadMap.get(vmapItem.tid)?.push(vmapItem);
       } else {
-        let itemArray = new Array<any>();
+        let itemArray = new Array<number | string>();
         itemArray.push(vmapItem);
         threadMap.set(vmapItem.tid, itemArray);
       }
@@ -701,15 +723,15 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
     this.threadStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 2;
     this.vmStatisticsAnalysisProgressEL!.loading = false;
-    this.threadPieChart(val);
+    this.threadPieChart();
   }
-  getVirtualMemorySo(item: any, val: any) {
+  getVirtualMemorySo(item: any) {
     this.vmStatisticsAnalysisProgressEL!.loading = true;
     let tid = item.tid;
     let pid = item.pid;
     let type = item.type;
     let allDur = 0;
-    let libMap = new Map<number, Array<any>>();
+    let libMap = new Map<number, Array<number | string>>();
     if (!this.vmStatisticsAnalysisProcessData || this.vmStatisticsAnalysisProcessData.length === 0) {
       return;
     }
@@ -721,7 +743,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
       if (libMap.has(vmItemData.libId)) {
         libMap.get(vmItemData.libId)?.push(vmItemData);
       } else {
-        let dataArray = new Array<any>();
+        let dataArray = new Array<number | string>();
         dataArray.push(vmItemData);
         libMap.set(vmItemData.libId, dataArray);
       }
@@ -757,10 +779,10 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
     this.libStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 3;
     this.vmStatisticsAnalysisProgressEL!.loading = false;
-    this.libraryPieChart(val);
+    this.libraryPieChart();
   }
 
-  getVirtualMemoryFunction(item: any, val: any) {
+  getVirtualMemoryFunction(item: any) {
     this.vmStatisticsAnalysisProgressEL!.loading = true;
     this.shadowRoot!.querySelector<HTMLDivElement>('.subheading')!.textContent = 'Statistic By Function AllDuration';
     let tid = item.tid;
@@ -785,7 +807,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
       if (symbolMap.has(vmProcessData.symbolId)) {
         symbolMap.get(vmProcessData.symbolId)?.push(vmProcessData);
       } else {
-        let dataArray = new Array<any>();
+        let dataArray = new Array<number | string>();
         dataArray.push(vmProcessData);
         symbolMap.set(vmProcessData.symbolId, dataArray);
       }
@@ -815,6 +837,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
     this.vmStatisticsAnalysisFunctionData.sort((a, b) => b.duration - a.duration);
     this.functionStatisticsData = this.totalDurationData(allDur);
     this.currentLevel = 4;
+    // @ts-ignore
     this.sumDur = this.libStatisticsData.allDuration;
     this.vmStatisticsAnalysisProgressEL!.loading = false;
     this.vmStatisticsAnalysisPie!.config = {
@@ -847,12 +870,14 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
         },
       ],
     };
-    this.vmStatisticsAnalysisTableFunction!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let data = evt.detail.data;
+    this.vmStatisticsAnalysisTableFunction!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let vmFunctionData = evt.detail;
+      if (vmFunctionData.data) {
+        let data = vmFunctionData.data;
         data.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (vmFunctionData.callBack) {
+          vmFunctionData.callBack(true);
         }
       }
       this.vmStatisticsAnalysisPie?.showHover();
@@ -869,16 +894,17 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
   }
-  typeIdToString(type: any) {
-    let releaseType: any;
+  typeIdToString(type: number) {
+    let releaseType: string;
     if (type === 1) {
       releaseType = 'File Backed In';
     } else if (type === 7) {
       releaseType = 'Copy On Writer';
     }
+    // @ts-ignore
     return releaseType;
   }
-  totalDurationData(duration: any) {
+  totalDurationData(duration: number) {
     let allDuration;
     allDuration = {
       durFormat: Utils.getProbablyTime(duration),
@@ -890,7 +916,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement {
   }
   getPieChartData(vmRes: any[]) {
     if (vmRes.length > 20) {
-      let pieChartArr: any[] = [];
+      let pieChartArr: string[] = [];
       let other: any = {
         tableName: 'other',
         duration: 0,
diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts
index be7cb0953e1f95a2ef2bfb4e52534d9d2f593f3f..8799248200caeb296af74d1df281f050b8291102 100644
--- a/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts
+++ b/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts
@@ -18,8 +18,6 @@ import { LitTable } from '../../../../../base-ui/table/lit-table.js';
 import { SelectionParam } from '../../../../bean/BoxSelection.js';
 import { LitChartPie } from '../../../../../base-ui/chart/pie/LitChartPie.js';
 import '../../../../../base-ui/chart/pie/LitChartPie.js';
-import { queryPerfProcess } from '../../../../database/SqlLite.js';
-import { PerfThread } from '../../../../bean/PerfProfile.js';
 import { LitProgressBar } from '../../../../../base-ui/progress-bar/LitProgressBar.js';
 import { procedurePool } from '../../../../database/Procedure.js';
 import { Utils } from '../../base/Utils.js';
@@ -37,23 +35,23 @@ export class TabPanePerfAnalysis extends BaseElement {
   private tableProcess: LitTable | null | undefined;
   private tableSo: LitTable | null | undefined;
   private tableFunction: LitTable | null | undefined;
-  private sumCount: any;
+  private sumCount: number | undefined | null;
   private perfAnalysisRange: HTMLLabelElement | null | undefined;
   private back: HTMLDivElement | null | undefined;
   private tabName: HTMLDivElement | null | undefined;
   private progressEL: LitProgressBar | null | undefined;
-  private processName: any;
-  private threadName: any;
+  private processName: HTMLDivElement | null | undefined;
+  private threadName: HTMLDivElement | null | undefined;
   private callChainMap!: Map<number, any>;
   private sortColumn: string = '';
   private sortType: number = 0;
-  private allProcessCount!: any;
-  private allThreadCount!: any;
-  private allLibCount!: any;
-  private allSymbolCount!: any;
+  private allProcessCount!: {};
+  private allThreadCount!: {};
+  private allLibCount!: {};
+  private allSymbolCount!: {};
   private currentLevel = -1;
   private currentLevelData!: Array<any>;
-  set data(val: SelectionParam | any) {
+  set data(val: SelectionParam) {
     if (val === this.currentSelection) {
       this.pidData.unshift(this.allProcessCount);
       this.tableProcess!.recycleDataSource = this.pidData;
@@ -68,6 +66,8 @@ export class TabPanePerfAnalysis extends BaseElement {
     this.tableSo!.style.display = 'none';
     this.tableFunction!.style.display = 'none';
     this.back!.style.visibility = 'hidden';
+    this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = '';
+    this.tabName!.textContent = '';
     this.perfAnalysisRange!.textContent =
       'Selected range: ' + parseFloat(((val.rightNs - val.leftNs) / 1000000.0).toFixed(5)) + ' ms';
     if (!this.callChainMap) {
@@ -125,7 +125,8 @@ export class TabPanePerfAnalysis extends BaseElement {
       }
     });
   }
-  processPieChart(val: any) {
+  processPieChart(val: SelectionParam) {
+    // @ts-ignore
     this.sumCount = this.allProcessCount.allCount;
     this.perfAnalysisPie!.config = {
       appendPadding: 0,
@@ -163,12 +164,14 @@ export class TabPanePerfAnalysis extends BaseElement {
         },
       ],
     };
-    this.tableProcess!.addEventListener('row-hover', (tblProcessRowHover: any) => {
-      if (tblProcessRowHover.detail.data) {
-        let data = tblProcessRowHover.detail.data;
+    this.tableProcess!.addEventListener('row-hover', (tblProcessRowHover) => {
+      // @ts-ignore
+      let tblProcessData = tblProcessRowHover.detail;
+      if (tblProcessData.data) {
+        let data = tblProcessData.data;
         data.isHover = true;
-        if ((tblProcessRowHover.detail as any).callBack) {
-          (tblProcessRowHover.detail as any).callBack(true);
+        if (tblProcessData.callBack) {
+          tblProcessData.callBack(true);
         }
       }
       this.perfAnalysisPie?.showHover();
@@ -186,14 +189,15 @@ export class TabPanePerfAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.tableProcess!.addEventListener('row-click', (evt: any) => {
+    this.tableProcess!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.count !== 0) {
         this.perfProcessLevelClickEvent(data, val);
       }
     });
   }
-  perfProcessLevelClickEvent(it: any, val: any) {
+  perfProcessLevelClickEvent(it: any, val: SelectionParam) {
     this.clearData();
     this.back!.style.visibility = 'visible';
     this.tableProcess!.style.display = 'none';
@@ -207,14 +211,16 @@ export class TabPanePerfAnalysis extends BaseElement {
     this.processName = it.tableName;
     this.perfAnalysisPie?.hideTip();
   }
-  threadPieChart(val: any) {
+  threadPieChart(val: SelectionParam) {
     if (val.perfThread.length > 0 && val.perfProcess.length === 0) {
       this.back!.style.visibility = 'hidden';
       this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = '';
       this.perfTableThread!.style.display = 'grid';
     } else {
+      // @ts-ignore
       this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = this.processName;
     }
+    // @ts-ignore
     this.sumCount = this.allThreadCount.allCount;
     this.perfAnalysisPie!.config = {
       appendPadding: 0,
@@ -252,12 +258,14 @@ export class TabPanePerfAnalysis extends BaseElement {
         },
       ],
     };
-    this.perfTableThread!.addEventListener('row-hover', (perfTblThreadRowHover: any) => {
-      if (perfTblThreadRowHover.detail.data) {
-        let data = perfTblThreadRowHover.detail.data;
+    this.perfTableThread!.addEventListener('row-hover', (perfTblThreadRowHover) => {
+      // @ts-ignore
+      let perfTblThreadData = perfTblThreadRowHover.detail;
+      if (perfTblThreadData.data) {
+        let data = perfTblThreadData.data;
         data.isHover = true;
-        if ((perfTblThreadRowHover.detail as any).callBack) {
-          (perfTblThreadRowHover.detail as any).callBack(true);
+        if (perfTblThreadData.callBack) {
+          perfTblThreadData.callBack(true);
         }
       }
       this.perfAnalysisPie?.showHover();
@@ -274,14 +282,15 @@ export class TabPanePerfAnalysis extends BaseElement {
     // @ts-ignore
     this.threadData.shift(this.allThreadCount);
     this.currentLevelData = this.threadData;
-    this.perfTableThread!.addEventListener('row-click', (evt: any) => {
+    this.perfTableThread!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.count !== 0) {
         this.perfThreadLevelClickEvent(data, val);
       }
     });
   }
-  perfThreadLevelClickEvent(it: any, val: any) {
+  perfThreadLevelClickEvent(it: any, val: SelectionParam) {
     this.clearData();
     this.back!.style.visibility = 'visible';
     this.perfTableThread!.style.display = 'none';
@@ -296,7 +305,8 @@ export class TabPanePerfAnalysis extends BaseElement {
     this.threadName = it.tableName;
     this.perfAnalysisPie?.hideTip();
   }
-  libraryPieChart(val: any) {
+  libraryPieChart(val: SelectionParam) {
+    // @ts-ignore
     this.sumCount = this.allLibCount.allCount;
     this.perfAnalysisPie!.config = {
       appendPadding: 0,
@@ -334,12 +344,14 @@ export class TabPanePerfAnalysis extends BaseElement {
         },
       ],
     };
-    this.tableSo!.addEventListener('row-hover', (tableSoRowHover: any) => {
-      if (tableSoRowHover.detail.data) {
-        let data = tableSoRowHover.detail.data;
+    this.tableSo!.addEventListener('row-hover', (tableSoRowHover) => {
+      // @ts-ignore
+      let tableSoData = tableSoRowHover.detail;
+      if (tableSoData.data) {
+        let data = tableSoData.data;
         data.isHover = true;
-        if ((tableSoRowHover.detail as any).callBack) {
-          (tableSoRowHover.detail as any).callBack(true);
+        if (tableSoData.callBack) {
+          tableSoData.callBack(true);
         }
       }
       this.perfAnalysisPie?.showHover();
@@ -357,20 +369,21 @@ export class TabPanePerfAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.tableSo!.addEventListener('row-click', (evt: any) => {
+    this.tableSo!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.count !== 0) {
         this.perfSoLevelClickEvent(data, val);
       }
     });
   }
-  perfSoLevelClickEvent(it: any, val: any) {
+  perfSoLevelClickEvent(it: any, val: SelectionParam) {
     this.clearData();
     this.tableSo!.style.display = 'none';
     this.tableFunction!.style.display = 'grid';
     this.tableSo!.setAttribute('hideDownload', '');
     this.tableFunction?.removeAttribute('hideDownload');
-    this.getHiperfFunction(it, val);
+    this.getHiperfFunction(it);
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent =
       // @ts-ignore
       this.processName + ' / ' + this.threadName + ' / ' + it.tableName;
@@ -458,7 +471,7 @@ export class TabPanePerfAnalysis extends BaseElement {
       currentTable!.recycleDataSource = arr;
     }
   }
-  async getHiperfProcess(val: any) {
+  async getHiperfProcess(val: SelectionParam) {
     this.progressEL!.loading = true;
     if (!this.processData || this.processData.length === 0) {
       this.progressEL!.loading = false;
@@ -475,7 +488,7 @@ export class TabPanePerfAnalysis extends BaseElement {
       return;
     }
     let allCount = 0;
-    let pidMap = new Map<number, Array<any>>();
+    let pidMap = new Map<number, Array<number | string>>();
     if (val.perfThread.length > 0 && val.perfProcess.length === 0) {
       this.tableProcess!.style.display = 'none';
       this.getHiperfThread(this.processData[0], val);
@@ -485,7 +498,7 @@ export class TabPanePerfAnalysis extends BaseElement {
         if (pidMap.has(itemData.pid)) {
           pidMap.get(itemData.pid)?.push(itemData);
         } else {
-          let itemArray = new Array<any>();
+          let itemArray = new Array<number | string>();
           itemArray.push(itemData);
           pidMap.set(itemData.pid, itemArray);
         }
@@ -514,16 +527,20 @@ export class TabPanePerfAnalysis extends BaseElement {
     }
     new ResizeObserver(() => {
       if (this.parentElement?.clientHeight != 0) {
-        this.tableProcess!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.perfTableThread!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.tableFunction!.style.height = this.parentElement!.clientHeight - 30 + 'px';
-        this.tableSo!.style.height = this.parentElement!.clientHeight - 30 + 'px';
+        this.tableProcess!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.tableProcess?.reMeauseHeight();
+        this.perfTableThread!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.perfTableThread?.reMeauseHeight();
+        this.tableFunction!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.tableFunction?.reMeauseHeight();
+        this.tableSo!.style.height = this.parentElement!.clientHeight - 50 + 'px';
+        this.tableSo?.reMeauseHeight();
       }
     }).observe(this.parentElement!);
   }
-  getHiperfThread(item: any, val: any) {
+  getHiperfThread(item: any, val: SelectionParam) {
     this.progressEL!.loading = true;
-    let threadMap = new Map<number, Array<any>>();
+    let threadMap = new Map<number, Array<number | string>>();
     let pid = item.pid;
     let allCount = 0;
     if (!this.processData || this.processData.length === 0) {
@@ -537,7 +554,7 @@ export class TabPanePerfAnalysis extends BaseElement {
       if (threadMap.has(itemData.tid)) {
         threadMap.get(itemData.tid)?.push(itemData);
       } else {
-        let itemArray = new Array<any>();
+        let itemArray = new Array<number | string>();
         itemArray.push(itemData);
         threadMap.set(itemData.tid, itemArray);
       }
@@ -565,13 +582,13 @@ export class TabPanePerfAnalysis extends BaseElement {
     this.progressEL!.loading = false;
     this.threadPieChart(val);
   }
-  getHiperfSo(item: any, val: any) {
+  getHiperfSo(item: any, val: SelectionParam) {
     this.progressEL!.loading = true;
     let parentCount = item.count;
     let tid = item.tid;
     let pid = item.pid;
     let allCount = 0;
-    let libMap = new Map<number, Array<any>>();
+    let libMap = new Map<number, Array<number | string>>();
     if (!this.processData || this.processData.length === 0) {
       return;
     }
@@ -583,7 +600,7 @@ export class TabPanePerfAnalysis extends BaseElement {
       if (libMap.has(itemData.libId)) {
         libMap.get(itemData.libId)?.push(itemData);
       } else {
-        let dataArray = new Array<any>();
+        let dataArray = new Array<number | string>();
         dataArray.push(itemData);
         libMap.set(itemData.libId, dataArray);
       }
@@ -612,7 +629,7 @@ export class TabPanePerfAnalysis extends BaseElement {
     this.progressEL!.loading = false;
     this.libraryPieChart(val);
   }
-  getHiperfFunction(item: any, val: any) {
+  getHiperfFunction(item: any) {
     this.progressEL!.loading = true;
     this.shadowRoot!.querySelector<HTMLDivElement>('.subheading')!.textContent = 'Statistic By Function Count';
     let parentCount = item.count;
@@ -632,7 +649,7 @@ export class TabPanePerfAnalysis extends BaseElement {
       if (symbolMap.has(itemData.symbolId)) {
         symbolMap.get(itemData.symbolId)?.push(itemData);
       } else {
-        let dataArray = new Array<any>();
+        let dataArray = new Array<number | string>();
         dataArray.push(itemData);
         symbolMap.set(itemData.symbolId, dataArray);
       }
@@ -658,6 +675,7 @@ export class TabPanePerfAnalysis extends BaseElement {
     this.allSymbolCount = this.totalCountData(allCount);
     this.currentLevel = 3;
     this.progressEL!.loading = false;
+    // @ts-ignore
     this.sumCount = this.allSymbolCount.allCount;
     this.perfAnalysisPie!.config = {
       appendPadding: 0,
@@ -688,12 +706,14 @@ export class TabPanePerfAnalysis extends BaseElement {
         },
       ],
     };
-    this.tableFunction!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let data = evt.detail.data;
+    this.tableFunction!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let functionData = evt.detail;
+      if (functionData.data) {
+        let data = functionData.data;
         data.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (functionData.callBack) {
+          functionData.callBack(true);
         }
       }
       this.perfAnalysisPie?.showHover();
@@ -710,7 +730,7 @@ export class TabPanePerfAnalysis extends BaseElement {
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
   }
-  totalCountData(count: any) {
+  totalCountData(count: number) {
     let allCount;
     allCount = {
       countFormat: Utils.timeMsFormat2p(count),
@@ -724,7 +744,7 @@ export class TabPanePerfAnalysis extends BaseElement {
 
   getPieChartData(res: any[]) {
     if (res.length > 20) {
-      let pieChartArr: any[] = [];
+      let pieChartArr: string[] = [];
       let other: any = {
         tableName: 'other',
         count: 0,
@@ -737,6 +757,7 @@ export class TabPanePerfAnalysis extends BaseElement {
         } else {
           other.count += res[i].count;
           other.countFormat = Utils.timeMsFormat2p(other.count);
+          // @ts-ignore
           other.percent = ((other.count / this.sumCount) * 100).toFixed(2);
         }
       }
@@ -745,13 +766,13 @@ export class TabPanePerfAnalysis extends BaseElement {
     }
     return res;
   }
-  getCallChainDataFromWorker(val: any) {
+  getCallChainDataFromWorker(val: SelectionParam) {
     this.getDataByWorker(val, (results: any) => {
       this.processData = results;
       this.getHiperfProcess(val);
     });
   }
-  getDataByWorker(val: any, handler: Function) {
+  getDataByWorker(val: SelectionParam, handler: Function) {
     this.progressEL!.loading = true;
     const args = [
       {
diff --git a/ide/src/trace/component/trace/sheet/jank/TabPaneFrames.ts b/ide/src/trace/component/trace/sheet/jank/TabPaneFrames.ts
index c6332e49f87588cccc3c01b2a4eac2de0972b8de..db89ff30051c1952ab399bbad2d77362aaabe574 100644
--- a/ide/src/trace/component/trace/sheet/jank/TabPaneFrames.ts
+++ b/ide/src/trace/component/trace/sheet/jank/TabPaneFrames.ts
@@ -40,81 +40,13 @@ export class TabPaneFrames extends BaseElement {
     framesParam.jankFramesData.forEach((data: Array<JanksStruct>) => {
       sumRes.occurrences += data.length;
       data.forEach((structValue: JanksStruct) => {
-        if (structValue.dur == null || structValue.dur == undefined) {
-          structValue.dur = 0;
-        }
         if (structValue.frame_type == 'app') {
-          if (structValue.jank_tag) {
-            appJank.flag = structValue.jank_tag;
-            appJank.jankType = 'APP Deadline Missed';
-            appJank.occurrences += 1;
-            appJank.maxDuration = Math.max(structValue.dur, appJank.maxDuration!);
-            if (appJank.minDuration == -1) {
-              appJank.minDuration = structValue.dur;
-            } else {
-              appJank.minDuration = Math.min(structValue.dur, appJank.minDuration!);
-            }
-            if (appJank.meanDuration == -1) {
-              appJank.meanDuration = structValue.dur;
-            } else {
-              appJank.meanDuration = Number(((structValue.dur + appJank.meanDuration!) / 2).toFixed(2));
-            }
-          } else {
-            this.refreshNoJankData(noJank, structValue);
-          }
+          this.appJankDataHandle(structValue, appJank, noJank);
         } else if (structValue.frame_type == 'renderService') {
-          if (structValue.jank_tag) {
-            rsJank.flag = structValue.jank_tag;
-            rsJank.jankType = 'RenderService Deadline Missed';
-            rsJank.occurrences += 1;
-            rsJank.maxDuration = Math.max(structValue.dur, rsJank.maxDuration!);
-            if (rsJank.minDuration == -1) {
-              rsJank.minDuration = structValue.dur;
-            } else {
-              rsJank.minDuration = Math.min(structValue.dur, rsJank.minDuration!);
-            }
-            if (rsJank.meanDuration == -1) {
-              rsJank.meanDuration = structValue.dur;
-            } else {
-              rsJank.meanDuration = Number(((structValue.dur + rsJank.meanDuration!) / 2).toFixed(2));
-            }
-          } else {
-            this.refreshNoJankData(noJank, structValue);
-          }
+          this.rsJankDataHandle(structValue, rsJank, noJank);
         } else {
           // frameTime
-          if (structValue.jank_tag) {
-            appJank.flag = structValue.jank_tag;
-            appJank.jankType = 'Deadline Missed';
-            appJank.occurrences += 1;
-            appJank.maxDuration = Math.max(structValue.dur, appJank.maxDuration);
-            appJank.minDuration = Math.min(structValue.dur, appJank.minDuration);
-            if (appJank.minDuration == -1) {
-              appJank.minDuration = structValue.dur;
-            } else {
-              appJank.minDuration = Math.min(structValue.dur, appJank.minDuration!);
-            }
-            if (appJank.meanDuration == -1) {
-              appJank.meanDuration = structValue.dur;
-            } else {
-              appJank.meanDuration = Number(((structValue.dur + appJank.meanDuration) / 2).toFixed(2));
-            }
-          } else {
-            noJank.flag = structValue.jank_tag;
-            noJank.jankType = 'None';
-            noJank.occurrences += 1;
-            noJank.maxDuration = Math.max(structValue.dur, noJank.maxDuration);
-            if (noJank.minDuration == -1) {
-              noJank.minDuration = structValue.dur;
-            } else {
-              noJank.minDuration = Math.min(structValue.dur, noJank.minDuration!);
-            }
-            if (noJank.meanDuration == -1) {
-              noJank.meanDuration = structValue.dur;
-            } else {
-              noJank.meanDuration = Number(((structValue.dur + noJank.meanDuration) / 2).toFixed(2));
-            }
-          }
+          this.frameTimelineJankDataHandle(structValue, appJank, noJank);
         }
       });
     });
@@ -141,6 +73,89 @@ export class TabPaneFrames extends BaseElement {
     this.framesTbl!.recycleDataSource = tablelist;
   }
 
+  private frameTimelineJankDataHandle(structValue: JanksStruct, appJank: JankFramesStruct, noJank: JankFramesStruct) {
+    if (structValue.dur == null || structValue.dur == undefined) {
+      structValue.dur = 0;
+    }
+    if (structValue && structValue.jank_tag && structValue.jank_tag > 0) {
+      appJank.flag = structValue.jank_tag;
+      appJank.jankType = 'Deadline Missed';
+      appJank.occurrences += 1;
+      appJank.maxDuration = Math.max(structValue.dur, appJank.maxDuration);
+      appJank.minDuration = Math.min(structValue.dur, appJank.minDuration);
+      if (appJank.minDuration == -1) {
+        appJank.minDuration = structValue.dur;
+      } else {
+        appJank.minDuration = Math.min(structValue.dur, appJank.minDuration!);
+      }
+      if (appJank.meanDuration == -1) {
+        appJank.meanDuration = structValue.dur;
+      } else {
+        appJank.meanDuration = Number(((structValue.dur + appJank.meanDuration) / 2).toFixed(2));
+      }
+    } else {
+      noJank.flag = structValue.jank_tag;
+      noJank.jankType = 'None';
+      noJank.occurrences += 1;
+      noJank.maxDuration = Math.max(structValue.dur, noJank.maxDuration);
+      if (noJank.minDuration == -1) {
+        noJank.minDuration = structValue.dur;
+      } else {
+        noJank.minDuration = Math.min(structValue.dur, noJank.minDuration!);
+      }
+      if (noJank.meanDuration == -1) {
+        noJank.meanDuration = structValue.dur;
+      } else {
+        noJank.meanDuration = Number(((structValue.dur + noJank.meanDuration) / 2).toFixed(2));
+      }
+    }
+  }
+  private rsJankDataHandle(structValue: JanksStruct, rsJank: JankFramesStruct, noJank: JankFramesStruct) {
+    if (structValue.dur == null || structValue.dur == undefined) {
+      structValue.dur = 0;
+    }
+    if (structValue.jank_tag && structValue.jank_tag > 0) {
+      rsJank.flag = structValue.jank_tag;
+      rsJank.jankType = 'RenderService Deadline Missed';
+      rsJank.occurrences += 1;
+      rsJank.maxDuration = Math.max(structValue.dur, rsJank.maxDuration!);
+      if (rsJank.minDuration == -1) {
+        rsJank.minDuration = structValue.dur;
+      } else {
+        rsJank.minDuration = Math.min(structValue.dur, rsJank.minDuration!);
+      }
+      if (rsJank.meanDuration == -1) {
+        rsJank.meanDuration = structValue.dur;
+      } else {
+        rsJank.meanDuration = Number(((structValue.dur + rsJank.meanDuration!) / 2).toFixed(2));
+      }
+    } else {
+      this.refreshNoJankData(noJank, structValue);
+    }
+  }
+  private appJankDataHandle(structValue: JanksStruct, appJank: JankFramesStruct, noJank: JankFramesStruct) {
+    if (structValue.dur == null || structValue.dur == undefined) {
+      structValue.dur = 0;
+    }
+    if (structValue.jank_tag && structValue.jank_tag > 0) {
+      appJank.flag = structValue.jank_tag;
+      appJank.jankType = 'APP Deadline Missed';
+      appJank.occurrences += 1;
+      appJank.maxDuration = Math.max(structValue.dur, appJank.maxDuration!);
+      if (appJank.minDuration == -1) {
+        appJank.minDuration = structValue.dur;
+      } else {
+        appJank.minDuration = Math.min(structValue.dur, appJank.minDuration!);
+      }
+      if (appJank.meanDuration == -1) {
+        appJank.meanDuration = structValue.dur;
+      } else {
+        appJank.meanDuration = Number(((structValue.dur + appJank.meanDuration!) / 2).toFixed(2));
+      }
+    } else {
+      this.refreshNoJankData(noJank, structValue);
+    }
+  }
   private refreshNoJankData(noJank: JankFramesStruct, structValue: JanksStruct) {
     noJank.flag = structValue.jank_tag;
     noJank.jankType = 'None';
diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts
index 5c992a06fd96f97068a97a4599961620365dd1d9..76feb0f47df6c9a2d6ff1a15d932cd7fc2902b3f 100644
--- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts
+++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts
@@ -81,13 +81,13 @@ class SizeObj {
 
 @element('tabpane-nm-statistic-analysis')
 export class TabPaneNMStatisticAnalysis extends BaseElement {
-  private currentSelection: SelectionParam | any;
+  private currentSelection: SelectionParam | null | undefined;
   private pie: LitChartPie | null | undefined;
   private processData!: Array<any>;
-  private eventTypeData!: any[];
-  private threadData!: any[];
-  private soData!: any[];
-  private functionData!: any[];
+  private eventTypeData!: Array<AnalysisObj>;
+  private threadData!: Array<AnalysisObj>;
+  private soData!: Array<AnalysisObj>;
+  private functionData!: Array<AnalysisObj>;
   private tableType: LitTable | null | undefined;
   private threadUsageTbl: LitTable | null | undefined;
   private soUsageTbl: LitTable | null | undefined;
@@ -108,14 +108,14 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
   private currentLevelApplyCount = 0;
   private currentLevelReleaseCount = 0;
   private currentLevelExistCount = 0;
-  private releaseLibMap!: Map<number, any>;
   private currentLevelData!: Array<any>;
   private typeStatisticsData!: {};
   private libStatisticsData!: {};
   private functionStatisticsData!: {};
 
-  set data(statisticAnalysisParam: SelectionParam | any) {
+  set data(statisticAnalysisParam: SelectionParam) {
     if (statisticAnalysisParam === this.currentSelection) {
+      // @ts-ignore
       this.eventTypeData.unshift(this.typeStatisticsData);
       this.tableType!.recycleDataSource = this.eventTypeData;
       // @ts-ignore
@@ -135,6 +135,8 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
     this.soUsageTbl!.style.display = 'none';
     this.functionUsageTbl!.style.display = 'none';
     this.back!.style.visibility = 'hidden';
+    this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = '';
+    this.tabName!.textContent = '';
     this.range!.textContent =
       'Selected range: ' +
       parseFloat(((statisticAnalysisParam.rightNs - statisticAnalysisParam.leftNs) / 1000000.0).toFixed(5)) +
@@ -172,7 +174,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
         this.tableType?.removeAttribute('hideDownload');
         this.currentLevel = 0;
         this.currentLevelData = this.eventTypeData;
-        this.typePieChart(this.currentSelection);
+        this.typePieChart();
       } else if (this.tabName!.textContent === 'Statistic By Function Existing') {
         this.soUsageTbl!.style.display = 'grid';
         this.functionUsageTbl!.style.display = 'none';
@@ -180,11 +182,11 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
         this.soUsageTbl?.removeAttribute('hideDownload');
         this.currentLevelData = this.soData;
         this.currentLevel = 1;
-        this.libraryPieChart(this.currentSelection);
+        this.libraryPieChart();
       }
     });
   }
-  typePieChart(val: any) {
+  typePieChart() {
     this.pie!.config = {
       appendPadding: 0,
       data: this.getPieChartData(this.eventTypeData),
@@ -205,9 +207,10 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
                         <div># Transient:${typeTipValue.obj.releaseCount} (${typeTipValue.obj.releaseCountPercent}%)</div>
                         </div>`;
       },
-      angleClick: (it: any) => {
+      angleClick: (it) => {
+        // @ts-ignore
         if (it.tableName != 'other') {
-          this.nativeProcessLevelClickEvent(it, val);
+          this.nativeProcessLevelClickEvent(it);
         }
       },
       hoverHandler: (data) => {
@@ -223,12 +226,14 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
         },
       ],
     };
-    this.tableType!.addEventListener('row-hover', (nmStatAnalysisTblRowHover: any) => {
-      if (nmStatAnalysisTblRowHover.detail.data) {
-        let data = nmStatAnalysisTblRowHover.detail.data;
+    this.tableType!.addEventListener('row-hover', (nmStatAnalysisTblRowHover) => {
+      // @ts-ignore
+      let nmStatAnalysisTblData = nmStatAnalysisTblRowHover.detail;
+      if (nmStatAnalysisTblData.data) {
+        let data = nmStatAnalysisTblData.data;
         data.isHover = true;
-        if ((nmStatAnalysisTblRowHover.detail as any).callBack) {
-          (nmStatAnalysisTblRowHover.detail as any).callBack(true);
+        if (nmStatAnalysisTblData.callBack) {
+          nmStatAnalysisTblData.callBack(true);
         }
       }
       this.pie?.showHover();
@@ -236,6 +241,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
     });
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = '';
     this.tabName!.textContent = 'Statistic By Event Type Existing';
+    // @ts-ignore
     this.eventTypeData.unshift(this.typeStatisticsData);
     this.tableType!.recycleDataSource = this.eventTypeData;
     this.tableType?.reMeauseHeight();
@@ -243,19 +249,21 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
     this.eventTypeData.shift(this.typeStatisticsData);
     this.currentLevelData = this.eventTypeData;
   }
-  nativeProcessLevelClickEvent(it: any, val: any) {
+  nativeProcessLevelClickEvent(it: object) {
     this.clearData();
     this.back!.style.visibility = 'visible';
     this.tableType!.style.display = 'none';
     this.soUsageTbl!.style.display = 'grid';
     this.tableType!.setAttribute('hideDownload', '');
     this.soUsageTbl?.removeAttribute('hideDownload');
-    this.getLibSize(it, val);
+    this.getLibSize(it);
+    // @ts-ignore
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = it.typeName;
+    // @ts-ignore
     this.type = it.typeName;
     this.pie?.hideTip();
   }
-  threadPieChart(val: any) {
+  threadPieChart() {
     this.pie!.config = {
       appendPadding: 0,
       data: this.getPieChartData(this.threadData),
@@ -276,13 +284,13 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
                         <div># Transient:${threadTipValue.obj.releaseCount} (${threadTipValue.obj.releaseCountPercent}%)</div>
                     </div>`;
       },
-      angleClick: (it: any) => {
+      angleClick: (it) => {
         // @ts-ignore
         if (it.tid != 'other') {
           this.clearData();
           this.threadUsageTbl!.style.display = 'none';
           this.soUsageTbl!.style.display = 'grid';
-          this.getLibSize(it, val);
+          this.getLibSize(it);
           // @ts-ignore
           this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = it.type + ' / ' + 'Thread ' + it.tid;
           // @ts-ignore
@@ -303,12 +311,14 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
         },
       ],
     };
-    this.threadUsageTbl!.addEventListener('row-hover', (nmStatAnalysisThreadRowHover: any) => {
-      if (nmStatAnalysisThreadRowHover.detail.data) {
-        let data = nmStatAnalysisThreadRowHover.detail.data;
+    this.threadUsageTbl!.addEventListener('row-hover', (nmStatAnalysisThreadRowHover) => {
+      // @ts-ignore
+      let nmStatAnalysisThreadData = nmStatAnalysisThreadRowHover.detail;
+      if (nmStatAnalysisThreadData.data) {
+        let data = nmStatAnalysisThreadData.data;
         data.isHover = true;
-        if ((nmStatAnalysisThreadRowHover.detail as any).callBack) {
-          (nmStatAnalysisThreadRowHover.detail as any).callBack(true);
+        if (nmStatAnalysisThreadData.callBack) {
+          nmStatAnalysisThreadData.callBack(true);
         }
       }
       this.pie?.showHover();
@@ -319,7 +329,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
     this.threadUsageTbl!.recycleDataSource = this.threadData;
     this.threadUsageTbl?.reMeauseHeight();
   }
-  libraryPieChart(val: any) {
+  libraryPieChart() {
     this.pie!.config = {
       appendPadding: 0,
       data: this.getPieChartData(this.soData),
@@ -340,10 +350,10 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
                         <div># Transient:${libraryTipValue.obj.releaseCount} (${libraryTipValue.obj.releaseCountPercent}%)</div>
                     </div>`;
       },
-      angleClick: (it: any) => {
+      angleClick: (it) => {
         // @ts-ignore
         if (it.tableName != 'other') {
-          this.nativeSoLevelClickEvent(it, val);
+          this.nativeSoLevelClickEvent(it);
         }
       },
       hoverHandler: (data) => {
@@ -360,18 +370,21 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
       ],
     };
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = this.type + '';
-    this.soUsageTbl!.addEventListener('row-hover', (nmStatAnalysisUsageRowHover: any) => {
-      if (nmStatAnalysisUsageRowHover.detail.data) {
-        let data = nmStatAnalysisUsageRowHover.detail.data;
+    this.soUsageTbl!.addEventListener('row-hover', (nmStatAnalysisUsageRowHover) => {
+      // @ts-ignore
+      let nmStatAnalysisUsageData = nmStatAnalysisUsageRowHover.detail;
+      if (nmStatAnalysisUsageData.data) {
+        let data = nmStatAnalysisUsageData.data;
         data.isHover = true;
-        if ((nmStatAnalysisUsageRowHover.detail as any).callBack) {
-          (nmStatAnalysisUsageRowHover.detail as any).callBack(true);
+        if (nmStatAnalysisUsageData.callBack) {
+          nmStatAnalysisUsageData.callBack(true);
         }
       }
       this.pie?.showHover();
       this.pie?.hideTip();
     });
     this.tabName!.textContent = 'Statistic By Library Existing';
+    // @ts-ignore
     this.soData.unshift(this.libStatisticsData);
     this.soUsageTbl!.recycleDataSource = this.soData;
     // @ts-ignore
@@ -382,24 +395,26 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.soUsageTbl!.addEventListener('row-click', (evt: any) => {
+    this.soUsageTbl!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.existSize !== 0) {
-        this.nativeSoLevelClickEvent(data, val);
+        this.nativeSoLevelClickEvent(data);
       }
     });
   }
-  nativeSoLevelClickEvent(it: any, val: any) {
+  nativeSoLevelClickEvent(it: object) {
     this.clearData();
     this.soUsageTbl!.style.display = 'none';
     this.functionUsageTbl!.style.display = 'grid';
     this.soUsageTbl!.setAttribute('hideDownload', '');
     this.functionUsageTbl?.removeAttribute('hideDownload');
-    this.getNMFunctionSize(it, val);
+    this.getNMFunctionSize(it);
+    // @ts-ignore
     this.shadowRoot!.querySelector<HTMLDivElement>('.title')!.textContent = this.type + ' / ' + it.libName;
     this.pie?.hideTip();
   }
-  functionPieChart(val: any) {
+  functionPieChart() {
     this.pie!.config = {
       appendPadding: 0,
       data: this.getPieChartData(this.functionData),
@@ -433,17 +448,20 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
         },
       ],
     };
-    this.functionUsageTbl!.addEventListener('row-hover', (evt: any) => {
-      if (evt.detail.data) {
-        let data = evt.detail.data;
+    this.functionUsageTbl!.addEventListener('row-hover', (evt) => {
+      // @ts-ignore
+      let functionAnalysisData = evt.detail;
+      if (functionAnalysisData.data) {
+        let data = functionAnalysisData.data;
         data.isHover = true;
-        if ((evt.detail as any).callBack) {
-          (evt.detail as any).callBack(true);
+        if (functionAnalysisData.callBack) {
+          functionAnalysisData.callBack(true);
         }
       }
       this.pie?.showHover();
       this.pie?.hideTip();
     });
+    // @ts-ignore
     this.functionData.unshift(this.functionStatisticsData);
     this.functionUsageTbl!.recycleDataSource = this.functionData;
     // @ts-ignore
@@ -576,7 +594,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
     }
   }
 
-  getNMEventTypeSize(val: any) {
+  getNMEventTypeSize(val: SelectionParam) {
     this.progressEL!.loading = true;
     let typeFilter = [];
     if (this.isStatistic) {
@@ -610,30 +628,31 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
-    this.tableType!.addEventListener('row-click', (evt: any) => {
+    this.tableType!.addEventListener('row-click', (evt) => {
+      // @ts-ignore
       let data = evt.detail.data;
       if (data.tableName !== '' && data.existSize !== 0) {
-        this.nativeProcessLevelClickEvent(data, val);
+        this.nativeProcessLevelClickEvent(data);
       }
     });
     new ResizeObserver(() => {
       // @ts-ignore
       if (this.parentElement?.clientHeight != 0) {
         // @ts-ignore
-        this.tableType?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 30 + 'px';
+        this.tableType?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 40 + 'px';
         this.tableType?.reMeauseHeight();
         // @ts-ignore
-        this.soUsageTbl?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 30 + 'px';
+        this.soUsageTbl?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 40 + 'px';
         this.soUsageTbl?.reMeauseHeight();
         // @ts-ignore
         this.functionUsageTbl?.shadowRoot?.querySelector('.table').style.height =
-          this.parentElement!.clientHeight - 30 + 'px';
+          this.parentElement!.clientHeight - 40 + 'px';
         this.functionUsageTbl?.reMeauseHeight();
       }
     }).observe(this.parentElement!);
   }
 
-  private calTypeSize(val: any, result: any) {
+  private calTypeSize(val: SelectionParam, result: any) {
     this.processData = JSON.parse(JSON.stringify(result));
     this.resetCurrentLevelData();
     this.typeMap = this.typeSizeGroup(this.processData);
@@ -648,13 +667,13 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
       }
     }
     if (this.typeMap.has(TYPE_MAP)) {
-      let subTypeMap = new Map<string, Array<any>>();
+      let subTypeMap = new Map<string, Array<number | string>>();
       for (let item of this.typeMap.get(TYPE_MAP)!) {
         if (item.subType) {
           if (subTypeMap.has(item.subType)) {
             subTypeMap.get(item.subType)?.push(item);
           } else {
-            let dataArray = new Array<any>();
+            let dataArray = new Array<number | string>();
             dataArray.push(item);
             subTypeMap.set(item.subType, dataArray);
           }
@@ -662,13 +681,13 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
           if (subTypeMap.has(TYPE_MAP_STRING)) {
             subTypeMap.get(TYPE_MAP_STRING)?.push(item);
           } else {
-            let dataArray = new Array<any>();
+            let dataArray = new Array<number | string>();
             dataArray.push(item);
             subTypeMap.set(TYPE_MAP_STRING, dataArray);
           }
         }
       }
-      subTypeMap.forEach((arr: Array<any>, subType: any) => {
+      subTypeMap.forEach((arr: Array<number | string>, subType: string) => {
         let mapType = this.setTypeMap(this.typeMap, TYPE_MAP, subType);
         if (mapType) {
           this.calPercent(mapType);
@@ -680,12 +699,12 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
     this.typeStatisticsData = this.totalData(this.typeStatisticsData);
     this.progressEL!.loading = false;
     this.currentLevel = 0;
-    this.typePieChart(val);
+    this.typePieChart();
   }
 
-  getNMThreadSize(item: any, val: any) {
+  getNMThreadSize(item: any, val: SelectionParam) {
     this.progressEL!.loading = true;
-    let threadMap = new Map<number, Array<any>>();
+    let threadMap = new Map<number, Array<number | string>>();
     let types = this.getTypes(item);
     this.resetCurrentLevelData(item);
 
@@ -697,13 +716,13 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
       if (threadMap.has(itemData.tid)) {
         threadMap.get(itemData.tid)?.push(itemData);
       } else {
-        let itemArray = new Array<any>();
+        let itemArray = new Array<number | string>();
         itemArray.push(itemData);
         threadMap.set(itemData.tid, itemArray);
       }
     }
     this.threadData = [];
-    threadMap.forEach((dbData: Array<any>, tid: number) => {
+    threadMap.forEach((dbData: Array<number | string>, tid: number) => {
       const sizeObj = this.calSizeObj(dbData);
       let analysis = new AnalysisObj(sizeObj.applySize, sizeObj.applyCount, sizeObj.releaseSize, sizeObj.releaseCount);
       this.calPercent(analysis);
@@ -717,19 +736,19 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
     this.threadData.sort((a, b) => b.existSize - a.existSize);
     this.currentLevelData = this.threadData;
     this.progressEL!.loading = false;
-    this.threadPieChart(val);
+    this.threadPieChart();
     this.threadUsageTbl!.addEventListener('column-click', (evt) => {
       // @ts-ignore
       this.sortByColumn(evt.detail.key, evt.detail.sort);
     });
   }
 
-  getLibSize(item: any, val: any) {
+  getLibSize(item: any) {
     this.progressEL!.loading = true;
     let typeId = item.typeId;
     let typeName = item.typeName;
     let tid = item.tid;
-    let libMap = new Map<number, Array<any>>();
+    let libMap = new Map<number, Array<number | string>>();
     this.resetCurrentLevelData(item);
     let types = this.getTypes(item);
     this.soData = [];
@@ -775,7 +794,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
       if (libMap.has(libId)) {
         libMap.get(libId)?.push(itemData);
       } else {
-        let dataArray = new Array<any>();
+        let dataArray = new Array<number | string>();
         dataArray.push(itemData);
         libMap.set(libId, dataArray);
       }
@@ -801,18 +820,18 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
     this.soData.sort((a, b) => b.existSize - a.existSize);
     this.libStatisticsData = this.totalData(this.libStatisticsData);
     this.currentLevel = 1;
-    this.libraryPieChart(val);
+    this.libraryPieChart();
     this.progressEL!.loading = false;
   }
 
-  getNMFunctionSize(item: any, val: any) {
+  getNMFunctionSize(item: any) {
     this.progressEL!.loading = true;
     this.shadowRoot!.querySelector<HTMLDivElement>('.subheading')!.textContent = 'Statistic By Function Existing';
     let typeId = item.typeId;
     let typeName = item.typeName;
     let tid = item.tid;
     let libId = item.libId;
-    let symbolMap = new Map<number, Array<any>>();
+    let symbolMap = new Map<number, Array<number | string>>();
     this.resetCurrentLevelData(item);
     let types = this.getTypes(item);
     if (!this.processData) {
@@ -857,7 +876,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
       if (symbolMap.has(data.symbolId)) {
         symbolMap.get(data.symbolId)?.push(data);
       } else {
-        let dataArray = new Array<any>();
+        let dataArray = new Array<number | string>();
         dataArray.push(data);
         symbolMap.set(data.symbolId, dataArray);
       }
@@ -886,12 +905,12 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
     this.functionStatisticsData = this.totalData(this.functionStatisticsData);
     this.currentLevel = 2;
     this.progressEL!.loading = false;
-    this.functionPieChart(val);
+    this.functionPieChart();
   }
 
   getPieChartData(res: any[]) {
     if (res.length > PIE_CHART_LIMIT) {
-      let pieChartArr: any[] = [];
+      let pieChartArr: string[] = [];
       let other: any = {
         tableName: 'other',
         symbolName: 'other',
@@ -900,8 +919,17 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
         existSize: 0,
         existSizeFormat: '',
         existCount: 0,
-        countPercent: 'other',
         existCountPercent: 0,
+        applySizeFormat: '',
+        applySize: 0,
+        applySizePercent: 0,
+        applyCount: 0,
+        applyCountPercent: 0,
+        releaseSizeFormat: '',
+        releaseSize: 0,
+        releaseSizePercent: 0,
+        releaseCount: 0,
+        releaseCountPercent: 0,
       };
       for (let i = 0; i < res.length; i++) {
         if (i < PIE_CHART_LIMIT - 1) {
@@ -909,9 +937,19 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
         } else {
           other.existCount += res[i].existCount;
           other.existSize += res[i].existSize;
+          other.applySize += res[i].applySize;
+          other.applyCount += res[i].applyCount;
+          other.releaseSize += res[i].releaseSize;
+          other.releaseCount += res[i].releaseCount;
           other.existSizeFormat = Utils.getBinaryByteWithUnit(other.existSize);
+          other.applySizeFormat = Utils.getBinaryByteWithUnit(other.applySize);
+          other.releaseSizeFormat = Utils.getBinaryByteWithUnit(other.releaseSize);
           other.existSizePercent = ((other.existSize / this.currentLevelExistSize) * 100).toFixed(2);
           other.existCountPercent = ((other.existCount / this.currentLevelExistCount) * 100).toFixed(2);
+          other.applySizePercent = ((other.applySize / this.currentLevelApplySize) * 100).toFixed(2);
+          other.applyCountPercent = ((other.applyCount / this.currentLevelApplyCount) * 100).toFixed(2);
+          other.releaseSizePercent = ((other.releaseSize / this.currentLevelReleaseSize) * 100).toFixed(2);
+          other.releaseCountPercent = ((other.releaseCount / this.currentLevelReleaseCount) * 100).toFixed(2);
         }
       }
       pieChartArr.push(other);
@@ -1009,8 +1047,8 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
     }
   }
 
-  private typeSizeGroup(dbArray: Array<any>): Map<number, Array<any>> {
-    let typeMap = new Map<number, Array<any>>();
+  private typeSizeGroup(dbArray: Array<number | string>): Map<number, Array<number | string>> {
+    let typeMap = new Map<number, Array<number | string>>();
     if (!dbArray || dbArray.length === 0) {
       return typeMap;
     }
@@ -1031,13 +1069,14 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
     }
 
     for (let itemData of dbArray) {
+      // @ts-ignore
       switch (itemData.type) {
         case TYPE_ALLOC:
           setSize(itemData);
           if (typeMap.has(TYPE_ALLOC)) {
             typeMap.get(TYPE_ALLOC)?.push(itemData);
           } else {
-            let itemArray = new Array<any>();
+            let itemArray = new Array<number | string>();
             itemArray.push(itemData);
             typeMap.set(TYPE_ALLOC, itemArray);
           }
@@ -1047,7 +1086,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
           if (typeMap.has(TYPE_MAP)) {
             typeMap.get(TYPE_MAP)?.push(itemData);
           } else {
-            let itemArray = new Array<any>();
+            let itemArray = new Array<number | string>();
             itemArray.push(itemData);
             typeMap.set(TYPE_MAP, itemArray);
           }
@@ -1057,7 +1096,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
     return typeMap;
   }
 
-  totalData(total: any) {
+  totalData(total: {}) {
     total = {
       existSizeFormat: Utils.getBinaryByteWithUnit(this.currentLevelExistSize),
       existSizePercent: ((this.currentLevelExistSize / this.currentLevelExistSize) * 100).toFixed(2),
@@ -1101,7 +1140,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
   }
 
   getTypes(parent: AnalysisObj) {
-    let types = new Array<any>();
+    let types = new Array<number | string>();
     types.push(parent.typeId!);
     types.push(parent.typeName!);
     if (!this.isStatistic) {
@@ -1116,7 +1155,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
     return types;
   }
 
-  getDataFromWorker(val: SelectionParam | any, typeFilter: Array<number | string>) {
+  getDataFromWorker(val: SelectionParam, typeFilter: Array<number | string>) {
     this.getDataByWorkerQuery(
       {
         leftNs: val.leftNs,
@@ -1202,17 +1241,17 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
                     <lit-table id="tb-eventtype-usage" style="max-height: 380px">
                         <lit-table-column width="250px" title="Memory Type" data-index="tableName" key="tableName" align="flex-start" order></lit-table-column>
                         <lit-table-column width="100px" title="Existing" data-index="existSizeFormat" key="existSizeFormat" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="existSizePercent" key="existSizePercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="existSizePercent" key="existSizePercent" align="flex-start"order></lit-table-column>
                         <lit-table-column width="100px" title="# Existing" data-index="existCount" key="existCount" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="existCountPercent" key="existCountPercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="existCountPercent" key="existCountPercent" align="flex-start"order></lit-table-column>
                         <lit-table-column width="100px" title="Total Bytes" data-index="applySizeFormat" key="applySizeFormat" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="applySizePercent" key="applySizePercent" align="flex-start" order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="applySizePercent" key="applySizePercent" align="flex-start" order></lit-table-column>
                         <lit-table-column width="100px" title="# Total" data-index="applyCount" key="applyCount" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="applyCountPercent" key="applyCountPercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="applyCountPercent" key="applyCountPercent" align="flex-start"order></lit-table-column>
                         <lit-table-column width="100px" title="Transient" data-index="releaseSizeFormat" key="releaseSizeFormat" align="flex-start"order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="releaseSizePercent" key="releaseSizePercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="releaseSizePercent" key="releaseSizePercent" align="flex-start"order></lit-table-column>
                         <lit-table-column width="100px" title="# Transient" data-index="releaseCount" key="releaseCount" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="releaseCountPercent" key="releaseCountPercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="releaseCountPercent" key="releaseCountPercent" align="flex-start"order></lit-table-column>
                     </lit-table>
                     <lit-table id="tb-thread-usage" style="display: none;max-height: 380px"hideDownload>
                         <lit-table-column width="100px" title="Memory Type" data-index="tableName" key="tableName" align="flex-start" ></lit-table-column>
@@ -1232,32 +1271,32 @@ export class TabPaneNMStatisticAnalysis extends BaseElement {
                     <lit-table id="tb-so-usage" style="display: none;max-height: 380px"hideDownload>
                         <lit-table-column width="250px" title="Library" data-index="tableName" key="tableName" align="flex-start"order></lit-table-column>
                         <lit-table-column width="100px" title="Existing" data-index="existSizeFormat" key="existSizeFormat" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="existSizePercent" key="existSizePercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="existSizePercent" key="existSizePercent" align="flex-start"order></lit-table-column>
                         <lit-table-column width="100px" title="# Existing" data-index="existCount" key="existCount" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="existCountPercent" key="existCountPercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="existCountPercent" key="existCountPercent" align="flex-start"order></lit-table-column>
                         <lit-table-column width="100px" title="Total Bytes" data-index="applySizeFormat" key="applySizeFormat" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="applySizePercent" key="applySizePercent" align="flex-start" order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="applySizePercent" key="applySizePercent" align="flex-start" order></lit-table-column>
                         <lit-table-column width="100px" title="# Total" data-index="applyCount" key="applyCount" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="applyCountPercent" key="applyCountPercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="applyCountPercent" key="applyCountPercent" align="flex-start"order></lit-table-column>
                         <lit-table-column width="100px" title="Transient" data-index="releaseSizeFormat" key="releaseSizeFormat" align="flex-start"order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="releaseSizePercent" key="releaseSizePercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="releaseSizePercent" key="releaseSizePercent" align="flex-start"order></lit-table-column>
                         <lit-table-column width="100px" title="# Transient" data-index="releaseCount" key="releaseCount" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="releaseCountPercent" key="releaseCountPercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="releaseCountPercent" key="releaseCountPercent" align="flex-start"order></lit-table-column>
                     </lit-table>
                     <lit-table id="tb-function-usage" style="display: none;max-height: 380px"hideDownload>
                         <lit-table-column width="250px" title="Function" data-index="tableName" key="tableName" align="flex-start"order></lit-table-column>
                          <lit-table-column width="100px" title="Existing" data-index="existSizeFormat" key="existSizeFormat" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="existSizePercent" key="existSizePercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="existSizePercent" key="existSizePercent" align="flex-start"order></lit-table-column>
                         <lit-table-column width="100px" title="# Existing" data-index="existCount" key="existCount" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="existCountPercent" key="existCountPercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="existCountPercent" key="existCountPercent" align="flex-start"order></lit-table-column>
                         <lit-table-column width="100px" title="Total Bytes" data-index="applySizeFormat" key="applySizeFormat" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="applySizePercent" key="applySizePercent" align="flex-start" order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="applySizePercent" key="applySizePercent" align="flex-start" order></lit-table-column>
                         <lit-table-column width="100px" title="# Total" data-index="applyCount" key="applyCount" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="applyCountPercent" key="applyCountPercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="applyCountPercent" key="applyCountPercent" align="flex-start"order></lit-table-column>
                         <lit-table-column width="100px" title="Transient" data-index="releaseSizeFormat" key="releaseSizeFormat" align="flex-start"order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="releaseSizePercent" key="releaseSizePercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="releaseSizePercent" key="releaseSizePercent" align="flex-start"order></lit-table-column>
                         <lit-table-column width="100px" title="# Transient" data-index="releaseCount" key="releaseCount" align="flex-start" order></lit-table-column>
-                        <lit-table-column width="50px" title="%" data-index="releaseCountPercent" key="releaseCountPercent" align="flex-start"order></lit-table-column>
+                        <lit-table-column width="100px" title="%" data-index="releaseCountPercent" key="releaseCountPercent" align="flex-start"order></lit-table-column>
                     </lit-table>
                     </div>
         </div>
diff --git a/ide/src/trace/component/trace/sheet/process/TabPaneSlices.ts b/ide/src/trace/component/trace/sheet/process/TabPaneSlices.ts
index cd50780b392e6d298e2736a8c32f7e768541ebec..2c871441b3cbde4ce002950a5dd5674943b5632a 100644
--- a/ide/src/trace/component/trace/sheet/process/TabPaneSlices.ts
+++ b/ide/src/trace/component/trace/sheet/process/TabPaneSlices.ts
@@ -41,7 +41,7 @@ export class TabPaneSlices extends BaseElement {
     });
     this.slicesTbl!.loading = true;
     getTabSlicesAsyncFunc(asyncNames, asyncPid, slicesParam.leftNs, slicesParam.rightNs).then((res) => {
-      getTabSlices(slicesParam.funTids, slicesParam.leftNs, slicesParam.rightNs).then((res2) => {
+      getTabSlices(slicesParam.funTids, slicesParam.processIds, slicesParam.leftNs, slicesParam.rightNs).then((res2) => {
         this.slicesTbl!.loading = false;
         let processSlicesResult = (res || []).concat(res2 || []);
         if (processSlicesResult != null && processSlicesResult.length > 0) {
diff --git a/ide/src/trace/component/trace/sheet/process/TabPaneThreadStates.ts b/ide/src/trace/component/trace/sheet/process/TabPaneThreadStates.ts
index 4154982e73f5fc2f2395994bf9872906f89d425b..7921b6ce952334bad081037527584fd1d6a3d1ab 100644
--- a/ide/src/trace/component/trace/sheet/process/TabPaneThreadStates.ts
+++ b/ide/src/trace/component/trace/sheet/process/TabPaneThreadStates.ts
@@ -49,25 +49,30 @@ export class TabPaneThreadStates extends BaseElement {
           log('getTabThreadStates result size : ' + result.length);
           let sumWall = 0.0;
           let sumOcc = 0;
+          let targetList = [];
           for (let e of result) {
-            let process = Utils.PROCESS_MAP.get(e.pid);
-            let thread = Utils.THREAD_MAP.get(e.tid);
-            e.process = process == null || process.length == 0 ? '[NULL]' : process;
-            e.thread = thread == null || thread.length == 0 ? '[NULL]' : thread;
-            sumWall += e.wallDuration;
-            sumOcc += e.occurrences;
-            e.stateJX = e.state;
-            e.state = Utils.getEndState(e.stateJX);
-            e.wallDuration = parseFloat((e.wallDuration / 1000000.0).toFixed(5));
-            e.avgDuration = parseFloat((e.avgDuration / 1000000.0).toFixed(5));
+            if (threadStatesParam.processIds.includes(e.pid)) {
+              let process = Utils.PROCESS_MAP.get(e.pid);
+              let thread = Utils.THREAD_MAP.get(e.tid);
+              e.process = process == null || process.length == 0 ? '[NULL]' : process;
+              e.thread = thread == null || thread.length == 0 ? '[NULL]' : thread;
+              sumWall += e.wallDuration;
+              sumOcc += e.occurrences;
+              e.stateJX = e.state;
+              e.state = Utils.getEndState(e.stateJX);
+              e.wallDuration = parseFloat((e.wallDuration / 1000000.0).toFixed(5));
+              e.avgDuration = parseFloat((e.avgDuration / 1000000.0).toFixed(5));
+              targetList.push(e);
+            }
+          }
+          if (targetList.length > 0) {
+            let count: any = {};
+            count.process = ' ';
+            count.state = ' ';
+            count.wallDuration = parseFloat((sumWall / 1000000.0).toFixed(5));
+            count.occurrences = sumOcc;
+            targetList.splice(0, 0, count);
           }
-          let targetList = result.filter((it) => threadStatesParam.processIds.includes(it.pid));
-          let count: any = {};
-          count.process = ' ';
-          count.state = ' ';
-          count.wallDuration = parseFloat((sumWall / 1000000.0).toFixed(5));
-          count.occurrences = sumOcc;
-          targetList.splice(0, 0, count);
           this.threadStatesTblSource = targetList;
           this.threadStatesTbl!.recycleDataSource = targetList;
           this.stackBar!.data = targetList;
@@ -108,7 +113,7 @@ export class TabPaneThreadStates extends BaseElement {
             padding: 10px 10px;
         }
         </style>
-        <div class="tread-states-table" style="display: flex;height: 20px;align-items: center;flex-direction: row;margin-bottom: 5px">
+        <div class="tread-states-table" style="display: flex;height: 20px;align-items: center;flex-direction: row;margin-bottom: 5px;justify-content: space-between">
             <stack-bar id="thread-states-stack-bar" style="width: calc(100vw - 520px)"></stack-bar>
             <label id="thread-states-time-range"  style="width: 250px;text-align: end;font-size: 10pt;">Selected range:0.0 ms</label>
         </div>
diff --git a/ide/src/trace/component/trace/sheet/process/TabPaneThreadUsage.ts b/ide/src/trace/component/trace/sheet/process/TabPaneThreadUsage.ts
index cc7bcf205d6e101a5474c6fe33f84a3686ede0c5..fa88226330bc7ead292bc9ae69f73b61e40b1d50 100644
--- a/ide/src/trace/component/trace/sheet/process/TabPaneThreadUsage.ts
+++ b/ide/src/trace/component/trace/sheet/process/TabPaneThreadUsage.ts
@@ -70,39 +70,41 @@ export class TabPaneThreadUsage extends BaseElement {
           let filterArr = result.filter((it) => threadUsageParam.processIds.includes(it.pid));
           let map: Map<number, any> = new Map<number, any>();
           for (let resultEl of filterArr) {
-            if (map.has(resultEl.tid)) {
-              map.get(resultEl.tid)[`cpu${resultEl.cpu}`] = resultEl.wallDuration || 0;
-              map.get(resultEl.tid)[`cpu${resultEl.cpu}TimeStr`] = getProbablyTime(resultEl.wallDuration || 0);
-              map.get(resultEl.tid)[`cpu${resultEl.cpu}Ratio`] = (
-                (100.0 * (resultEl.wallDuration || 0)) /
-                (threadUsageParam.rightNs - threadUsageParam.leftNs)
-              ).toFixed(2);
-              map.get(resultEl.tid)[`wallDuration`] =
-                map.get(resultEl.tid)[`wallDuration`] + (resultEl.wallDuration || 0);
-              map.get(resultEl.tid)[`wallDurationTimeStr`] = getProbablyTime(map.get(resultEl.tid)[`wallDuration`]);
-            } else {
-              let process = Utils.PROCESS_MAP.get(resultEl.pid);
-              let thread = Utils.THREAD_MAP.get(resultEl.tid);
-              let threadStatesStruct: any = {
-                tid: resultEl.tid,
-                pid: resultEl.pid,
-                thread: thread || 'null',
-                process: process || 'null',
-                wallDuration: resultEl.wallDuration || 0,
-                wallDurationTimeStr: getProbablyTime(resultEl.wallDuration || 0),
-              };
-              for (let i = 0; i < this.cpuCount; i++) {
-                threadStatesStruct[`cpu${i}`] = 0;
-                threadStatesStruct[`cpu${i}TimeStr`] = '0';
-                threadStatesStruct[`cpu${i}Ratio`] = '0';
+            if (threadUsageParam.processIds.includes(resultEl.pid)) {
+              if (map.has(resultEl.tid)) {
+                map.get(resultEl.tid)[`cpu${resultEl.cpu}`] = resultEl.wallDuration || 0;
+                map.get(resultEl.tid)[`cpu${resultEl.cpu}TimeStr`] = getProbablyTime(resultEl.wallDuration || 0);
+                map.get(resultEl.tid)[`cpu${resultEl.cpu}Ratio`] = (
+                  (100.0 * (resultEl.wallDuration || 0)) /
+                  (threadUsageParam.rightNs - threadUsageParam.leftNs)
+                ).toFixed(2);
+                map.get(resultEl.tid)[`wallDuration`] =
+                  map.get(resultEl.tid)[`wallDuration`] + (resultEl.wallDuration || 0);
+                map.get(resultEl.tid)[`wallDurationTimeStr`] = getProbablyTime(map.get(resultEl.tid)[`wallDuration`]);
+              } else {
+                let process = Utils.PROCESS_MAP.get(resultEl.pid);
+                let thread = Utils.THREAD_MAP.get(resultEl.tid);
+                let threadStatesStruct: any = {
+                  tid: resultEl.tid,
+                  pid: resultEl.pid,
+                  thread: thread || 'null',
+                  process: process || 'null',
+                  wallDuration: resultEl.wallDuration || 0,
+                  wallDurationTimeStr: getProbablyTime(resultEl.wallDuration || 0),
+                };
+                for (let i = 0; i < this.cpuCount; i++) {
+                  threadStatesStruct[`cpu${i}`] = 0;
+                  threadStatesStruct[`cpu${i}TimeStr`] = '0';
+                  threadStatesStruct[`cpu${i}Ratio`] = '0';
+                }
+                threadStatesStruct[`cpu${resultEl.cpu}`] = resultEl.wallDuration || 0;
+                threadStatesStruct[`cpu${resultEl.cpu}TimeStr`] = getProbablyTime(resultEl.wallDuration || 0);
+                threadStatesStruct[`cpu${resultEl.cpu}Ratio`] = (
+                  (100.0 * (resultEl.wallDuration || 0)) /
+                  (threadUsageParam.rightNs - threadUsageParam.leftNs)
+                ).toFixed(2);
+                map.set(resultEl.tid, threadStatesStruct);
               }
-              threadStatesStruct[`cpu${resultEl.cpu}`] = resultEl.wallDuration || 0;
-              threadStatesStruct[`cpu${resultEl.cpu}TimeStr`] = getProbablyTime(resultEl.wallDuration || 0);
-              threadStatesStruct[`cpu${resultEl.cpu}Ratio`] = (
-                (100.0 * (resultEl.wallDuration || 0)) /
-                (threadUsageParam.rightNs - threadUsageParam.leftNs)
-              ).toFixed(2);
-              map.set(resultEl.tid, threadStatesStruct);
             }
           }
           this.threadUsageSource = Array.from(map.values());
diff --git a/ide/src/trace/component/trace/timer-shaft/RangeRuler.ts b/ide/src/trace/component/trace/timer-shaft/RangeRuler.ts
index ec16e5b5d7c90eece3b3f1a69656a7d70cd0cc64..3de15dc5514eb4044bc1a3008aa898079f082021 100644
--- a/ide/src/trace/component/trace/timer-shaft/RangeRuler.ts
+++ b/ide/src/trace/component/trace/timer-shaft/RangeRuler.ts
@@ -15,7 +15,7 @@
 
 import { Graph } from './Graph.js';
 import { Rect } from './Rect.js';
-import { ns2s, TimerShaftElement } from '../TimerShaftElement.js';
+import {ns2s, ns2UnitS, TimerShaftElement} from '../TimerShaftElement.js';
 import { ColorUtils } from '../base/ColorUtils.js';
 import { CpuStruct } from '../../../database/ui-worker/ProcedureWorkerCPU.js';
 
@@ -82,6 +82,7 @@ export class RangeRuler extends Graph {
   public rangeRect: Rect;
   public markAObj: Mark;
   public markBObj: Mark;
+  public drawMark: boolean = false;
   public range: TimeRange;
   private pressedKeys: Array<string> = [];
   mouseDownOffsetX = 0;
@@ -172,24 +173,26 @@ export class RangeRuler extends Graph {
       this.c.globalAlpha = 1;
     }
     //绘制选中区域
-    this.c.fillStyle = window.getComputedStyle(this.canvas!, null).getPropertyValue('background-color');
-    this.rangeRect.x = this.markAObj.frame.x < this.markBObj.frame.x ? this.markAObj.frame.x : this.markBObj.frame.x;
-    this.rangeRect.width = Math.abs(this.markBObj.frame.x - this.markAObj.frame.x);
-    this.c.fillRect(this.rangeRect.x, this.rangeRect.y, this.rangeRect.width, this.rangeRect.height);
-    this.c.globalAlpha = 1;
-    this.c.globalAlpha = 0.5;
-    this.c.fillStyle = '#999999';
-    this.c.fillRect(this.frame.x, this.frame.y, this.rangeRect.x, this.rangeRect.height);
-    this.c.fillRect(
-      this.rangeRect.x + this.rangeRect.width,
-      this.frame.y,
-      this.frame.width - this.rangeRect.width,
-      this.rangeRect.height
-    );
-    this.c.globalAlpha = 1;
-    this.c.closePath();
-    this.markAObj.draw();
-    this.markBObj.draw();
+    if (this.drawMark) {
+      this.c.fillStyle = window.getComputedStyle(this.canvas!, null).getPropertyValue('background-color');
+      this.rangeRect.x = this.markAObj.frame.x < this.markBObj.frame.x ? this.markAObj.frame.x : this.markBObj.frame.x;
+      this.rangeRect.width = Math.abs(this.markBObj.frame.x - this.markAObj.frame.x);
+      this.c.fillRect(this.rangeRect.x, this.rangeRect.y, this.rangeRect.width, this.rangeRect.height);
+      this.c.globalAlpha = 1;
+      this.c.globalAlpha = 0.5;
+      this.c.fillStyle = '#999999';
+      this.c.fillRect(this.frame.x, this.frame.y, this.rangeRect.x, this.rangeRect.height);
+      this.c.fillRect(
+        this.rangeRect.x + this.rangeRect.width,
+        this.frame.y,
+        this.frame.width - this.rangeRect.width,
+        this.rangeRect.height
+      );
+      this.c.globalAlpha = 1;
+      this.c.closePath();
+      this.markAObj.draw();
+      this.markBObj.draw();
+    }
     if (this.notifyHandler) {
       this.range.startX = this.rangeRect.x;
       this.range.endX = this.rangeRect.x + this.rangeRect.width;
@@ -239,21 +242,24 @@ export class RangeRuler extends Graph {
         startX += first_NodeWidth;
         tempNs += yu;
         this.range.xs.push(startX);
-        this.range.xsTxt.push(ns2s(tempNs));
+        this.range.xsTxt.push(ns2UnitS(tempNs + this.range.startNS, this.scale));
       }
       while (tempNs < this.range.endNS - this.range.startNS) {
         startX += realW;
         tempNs += this.scale;
         this.range.xs.push(startX);
-        this.range.xsTxt.push(ns2s(tempNs));
+        this.range.xsTxt.push(ns2UnitS(tempNs + this.range.startNS, this.scale));
       }
-
       if (!discardNotify) {
         this.notifyHandler(this.range);
       }
     }
   }
 
+  getScale() {
+    return this.scale;
+  }
+
   mouseDown(mouseEventDown: MouseEvent) {
     let down_x = mouseEventDown.offsetX - (this.canvas?.offsetLeft || 0);
     let down_y = mouseEventDown.offsetY - (this.canvas?.offsetTop || 0);
@@ -534,7 +540,6 @@ export class RangeRuler extends Graph {
 
   keyPressA() {
     let animA = () => {
-
       if (this.range.startNS <= 0) {
         this.fillX();
         this.range.refresh = true;
diff --git a/ide/src/trace/component/trace/timer-shaft/SportRuler.ts b/ide/src/trace/component/trace/timer-shaft/SportRuler.ts
index 83c7192907524094e335b061342948a15ce7e31a..6419c503836682797563d098167a4110e2c6b0d6 100644
--- a/ide/src/trace/component/trace/timer-shaft/SportRuler.ts
+++ b/ide/src/trace/component/trace/timer-shaft/SportRuler.ts
@@ -129,6 +129,7 @@ export class SportRuler extends Graph {
     }
     this.draw();
   }
+
   modifySicesTimeList(slicestime: SlicesTime | null | undefined) {
     if (slicestime) {
       let i = this.slicesTimeList.findIndex((it) => it.id == slicestime.id);
@@ -147,7 +148,6 @@ export class SportRuler extends Graph {
     }
     this.draw();
   }
-
   draw(): void {
     this.rulerW = this.canvas!.offsetWidth;
     this.c.clearRect(this.frame.x, this.frame.y, this.frame.width, this.frame.height + 1);
@@ -174,7 +174,7 @@ export class SportRuler extends Graph {
     this.range.xs?.forEach((item, index) => {
       this.c.moveTo(item, this.frame.y);
       this.c.lineTo(item, this.frame.y + this.frame.height);
-      this.c.fillText(`+${this.range.xsTxt[index]}`, item + 3, this.frame.y + 12);
+      this.c.fillText(`${this.range.xsTxt[index]}`, item + 3, this.frame.y + 12);
     });
     this.c.stroke();
     this.c.closePath();
@@ -299,7 +299,6 @@ export class SportRuler extends Graph {
       );
   }
 
-  // 绘制一个倒三角 ▼
   drawInvertedTriangle(time: number, color: string = '#000000') {
     if (time != null && typeof time != undefined) {
       let x = Math.round((this.rulerW * (time - this.range.startNS)) / (this.range.endNS - this.range.startNS));
@@ -330,7 +329,6 @@ export class SportRuler extends Graph {
       let startX = Math.round(
         (this.rulerW * (startTime - this.range.startNS)) / (this.range.endNS - this.range.startNS)
       );
-
       let endX = Math.round((this.rulerW * (endTime - this.range.startNS)) / (this.range.endNS - this.range.startNS));
       let color = randomRgbColor();
       this.slicesTime.color = color;
@@ -344,7 +342,6 @@ export class SportRuler extends Graph {
         color,
         true
       );
-
       if (!shiftKey) {
         this.clearTempSlicesTime(); // 清除临时对象
 
@@ -388,24 +385,19 @@ export class SportRuler extends Graph {
     this.hoverFlag.hidden = false;
   }
 
-  //功能描述： 绘制多个帽子(两个三角形中间加一条横线)
-  // ________________
-  // |/            \|
   drawSlicesMarks(slicesTime: SlicesTime) {
     if (
       slicesTime.startTime != null &&
       typeof slicesTime.startTime != undefined &&
       slicesTime.endTime != null &&
       typeof slicesTime.endTime != undefined
-    ) {
+    )  {
       let startX = Math.round(
         (this.rulerW * (slicesTime.startTime - this.range.startNS)) / (this.range.endNS - this.range.startNS)
       );
-
       let endX = Math.round(
         (this.rulerW * (slicesTime.endTime - this.range.startNS)) / (this.range.endNS - this.range.startNS)
       );
-     
       // 放大、缩小、左右移动之后重置小三角的x轴坐标
       slicesTime.startX = startX;
       slicesTime.endX = endX;
@@ -516,6 +508,7 @@ export class SportRuler extends Graph {
     }
     return slicestime;
   }
+
   mouseUp(ev: MouseEvent) {
     if (this.edgeDetection(ev)) {
       let x = ev.offsetX - (this.canvas?.offsetLeft || 0); // 鼠标点击的x轴坐标
@@ -546,7 +539,6 @@ export class SportRuler extends Graph {
   }
 
   mouseMove(ev: MouseEvent) {
-    let x = ev.offsetX - (this.canvas?.offsetLeft || 0);
     if (this.edgeDetection(ev)) {
       let x = ev.offsetX - (this.canvas?.offsetLeft || 0);
       let flg = this.flagList.find((it) => x >= it.x && x <= it.x + 18);
diff --git a/ide/src/trace/database/DBUtils.ts b/ide/src/trace/database/DBUtils.ts
new file mode 100644
index 0000000000000000000000000000000000000000..6cf6c2b2aac3a9128b530be93eb999991cd2dd4c
--- /dev/null
+++ b/ide/src/trace/database/DBUtils.ts
@@ -0,0 +1,146 @@
+import { info } from '../../log/Log.js';
+
+/**
+ * 数据缓存期限
+ */
+const file_cache_due = 24 * 60 * 60 * 1000;
+const db_version = 6;
+/**
+ * 初始化indexed db
+ */
+export function initIndexedDB(): Promise<IDBDatabase> {
+  return new Promise((resolve, reject) => {
+    let request = indexedDB.open('smart_perf', db_version);
+    request.onerror = function (event) {};
+    request.onsuccess = function (event) {
+      let db = request.result;
+      resolve(db);
+    };
+    request.onupgradeneeded = function (event) {
+      // @ts-ignore
+      let db = event!.target!.result;
+      if (db.objectStoreNames.contains('trace_file')) {
+        info('delete trace_file table');
+        db.deleteObjectStore('trace_file');
+      }
+      info('create trace_file table');
+      let objectStore = db.createObjectStore('trace_file', { keyPath: 'file_index' });
+      objectStore.createIndex('file_no', 'file_no');
+      objectStore.createIndex('file_id', 'file_id');
+      objectStore.createIndex('file_time', 'file_time');
+      objectStore.createIndex('file_buffer', 'file_buffer');
+    };
+  });
+}
+
+/**
+ * 删除过期数据
+ * @param db
+ */
+export function deleteExpireData(db: IDBDatabase) {
+  if (db && db.objectStoreNames.contains('trace_file')) {
+    let objectStore = db.transaction(['trace_file'], 'readwrite').objectStore('trace_file');
+    let request = objectStore.getAll();
+    request.onsuccess = function (event) {
+      let now = new Date().getTime();
+      for (let re of request.result) {
+        if (now - re.file_time > file_cache_due) {
+          objectStore.delete(re.file_index);
+        }
+      }
+      db.close();
+    };
+    request.onerror = function () {
+      info('delete expire data failed');
+    };
+  }
+}
+
+/**
+ * 缓存数据
+ * @param db 数据库链接对象
+ * @param oldFileId 上次打开的文件id
+ * @param fileId 当前打开的文件id
+ * @param buffer 二进制数据
+ */
+export function cacheTraceFileBuffer(db: IDBDatabase, oldFileId: string, fileId: string, buffer: ArrayBuffer) {
+  if (db && db.objectStoreNames.contains('trace_file')) {
+    let objectStore = db.transaction(['trace_file'], 'readwrite').objectStore('trace_file');
+    let request = objectStore.index('file_id').getAll(oldFileId);
+    request.onsuccess = function (event) {
+      for (let re of request.result) {
+        objectStore.delete(re.file_index);
+      }
+      info('delete file success');
+      let size = buffer.byteLength;
+      let index = 0;
+      let no = 0;
+      let time = new Date().getTime();
+      while (index < size) {
+        let sliceLen = Math.min(size - index, 4 * 1024 * 1024);
+        objectStore.add({
+          file_index: randomUUID(),
+          file_no: no,
+          file_id: fileId,
+          file_time: time,
+          file_buffer: buffer.slice(index, index + sliceLen),
+        });
+        no++;
+        index += sliceLen;
+      }
+      info('cache file success', fileId, buffer.byteLength);
+      db.close();
+    };
+    request.onerror = function (ev) {
+      info('delete error', fileId);
+    };
+  }
+}
+
+function randomUUID(): string {
+  // @ts-ignore
+  return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c: any) =>
+    (c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))).toString(16)
+  );
+}
+
+/**
+ * 获取当前文件的 二进制数据
+ * @param fileId
+ */
+export function getTraceFileBuffer(fileId: string): Promise<ArrayBuffer | null> {
+  return new Promise((resolve) => {
+    if (fileId === null || fileId === undefined || fileId === '') {
+      resolve(new Uint8Array(0).buffer);
+    } else {
+      initIndexedDB().then((db) => {
+        if (db && db.objectStoreNames.contains('trace_file')) {
+          let request = db
+            .transaction(['trace_file'], 'readwrite')
+            .objectStore('trace_file')
+            .index('file_id')
+            .getAll(fileId);
+          request.onsuccess = function (ev) {
+            let totalLen = 0;
+            let arr = request.result.sort((a, b) => a.file_no - b.file_no);
+            for (let re of arr) {
+              totalLen += re.file_buffer.byteLength;
+            }
+            let buffer = new Uint8Array(totalLen);
+            let offset = 0;
+            for (let re of arr) {
+              let ua = new Uint8Array(re.file_buffer);
+              buffer.set(ua, offset);
+              offset += re.file_buffer.byteLength;
+            }
+            arr.length = 0;
+            request.result.length = 0;
+            resolve(buffer.buffer);
+          };
+        } else {
+          resolve(new Uint8Array(0).buffer);
+        }
+      });
+    }
+  });
+}
\ No newline at end of file
diff --git a/ide/src/trace/database/SqlLite.ts b/ide/src/trace/database/SqlLite.ts
index 1fa17e88681ed9e336c48bf82ed15bffd233a082..4cbd0e7fd89bf081fcf205b8d4cc23bbd6c933b0 100644
--- a/ide/src/trace/database/SqlLite.ts
+++ b/ide/src/trace/database/SqlLite.ts
@@ -262,13 +262,13 @@ export class DbPool {
   initServer = async (url: string, progress: Function) => {
     this.progress = progress;
     progress('database loaded', 15);
-    let buf = await fetch(url).then((res) => res.arrayBuffer());
-    DbPool.sharedBuffer = buf;
+    DbPool.sharedBuffer = await fetch(url).then((res) => res.arrayBuffer());
     progress('open database', 20);
     for (let i = 0; i < this.works.length; i++) {
       let thread = this.works[i];
       let { status, msg } = await thread.dbOpen();
       if (!status) {
+        DbPool.sharedBuffer = null;
         return { status, msg };
       }
     }
@@ -284,6 +284,7 @@ export class DbPool {
       let thread = this.works[i];
       let { status, msg, buffer, sdkConfigMap } = await thread.dbOpen(sdkWasmConfig);
       if (!status) {
+        DbPool.sharedBuffer = null;
         return { status, msg };
       } else {
         configMap = sdkConfigMap;
@@ -519,13 +520,11 @@ export const getFps = () =>
     {}
   );
 
-export const getFunDataByTid = (tid: number): Promise<Array<FuncStruct>> =>
+export const getFunDataByTid = (tid: number, ipid: number): Promise<Array<FuncStruct>> =>
   query(
     'getFunDataByTid',
     `
     select 
-    --tid,
-    --A.name as threadName,
     c.ts-D.start_ts as startTs,
     c.dur,
     c.name as funName,
@@ -533,8 +532,8 @@ export const getFunDataByTid = (tid: number): Promise<Array<FuncStruct>> =>
     c.depth
 from thread A,trace_range D
 left join callstack C on A.id = C.callid
-where startTs not null and c.cookie is null and tid = $tid`,
-    { $tid: tid }
+where startTs not null and c.cookie is null and tid = $tid and A.ipid = $ipid`,
+    { $tid: tid , $ipid: ipid}
   );
 
 export const getMaxDepthByTid = (): Promise<Array<any>> =>
@@ -543,10 +542,11 @@ export const getMaxDepthByTid = (): Promise<Array<any>> =>
     `
     select
 tid,
+ipid,
     MAX(c.depth + 1) as maxDepth
 from thread A
 left join callstack C on A.id = C.callid
-where c.ts not null and c.cookie is null group by tid`,
+where c.ts not null and c.cookie is null group by tid,ipid`,
     {}
   );
 
@@ -830,7 +830,7 @@ export const getTabCpuByThread = (cpus: Array<number>, leftNS: number, rightNS:
     { $rightNS: rightNS, $leftNS: leftNS }
   );
 
-export const getTabSlices = (funTids: Array<number>, leftNS: number, rightNS: number): Promise<Array<any>> =>
+export const getTabSlices = (funTids: Array<number>, pids: Array<number>, leftNS: number, rightNS: number): Promise<Array<any>> =>
   query<SelectionData>(
     'getTabSlices',
     `
@@ -841,6 +841,7 @@ export const getTabSlices = (funTids: Array<number>, leftNS: number, rightNS: nu
       count(c.name) as occurrences
     from
       thread T, trace_range TR
+      left join process P on T.ipid = P.id
     left join
       callstack C
     on
@@ -851,6 +852,8 @@ export const getTabSlices = (funTids: Array<number>, leftNS: number, rightNS: nu
       c.dur >= 0
     and
       T.tid in (${funTids.join(',')})
+    and
+      P.pid in (${pids.join(',')})
     and
       c.name != 'binder transaction async'
     and
@@ -1199,7 +1202,7 @@ export const queryProcessThreadsByTable = (): Promise<Array<ThreadStruct>> =>
   query(
     'queryProcessThreadsByTable',
     `
-        select p.pid as pid,t.tid as tid,p.name as processName,t.name as threadName from thread t left join process  p on t.ipid = p.id where t.tid != 0;
+        select p.pid as pid,p.ipid as upid,t.tid as tid,p.name as processName,t.name as threadName from thread t left join process  p on t.ipid = p.id where t.tid != 0;
     `
   );
 export const queryVirtualMemory = (): Promise<Array<any>> =>
@@ -1234,7 +1237,7 @@ export const queryProcessThreads = (): Promise<Array<ThreadStruct>> =>
     {}
   );
 
-export const queryThreadData = (tid: number): Promise<Array<ThreadStruct>> =>
+export const queryThreadData = (tid: number, pid: number): Promise<Array<ThreadStruct>> =>
   query(
     'queryThreadData',
     `
@@ -1249,8 +1252,8 @@ export const queryThreadData = (tid: number): Promise<Array<ThreadStruct>> =>
      , B.arg_setid as argSetID
 from thread_state AS B
     left join trace_range AS TR
-where B.tid = $tid;`,
-    { $tid: tid }
+where B.tid = $tid and B.pid = $pid;`,
+    { $tid: tid, $pid: pid }
   );
 
 export const queryThreadAndProcessName = (): Promise<Array<any>> =>
@@ -3654,8 +3657,8 @@ export const queryNativeMemoryRealTime = (): Promise<Array<any>> =>
 export const queryBootTime = (): Promise<Array<any>> =>
   query(
     'queryBootTime',
-    `select ts,clock_name from clock_snapshot where clock_name = 'boottime'
-`,
+    `select CS.ts -TR.start_ts as ts ,clock_name from clock_snapshot as CS ,trace_range as TR
+      where clock_name = 'boottime'`,
     {}
   );
 
@@ -3804,60 +3807,59 @@ export const queryAllActualData = (): Promise<Array<any>> =>
 export const queryActualFrameDate = (): Promise<Array<any>> =>
   query(
     'queryActualFrameDate',
-    `
-        SELECT
-               sf.id,
-               'frameTime' as frame_type,
-               fs.ipid,
-               fs.vsync as name,
-               fs.dur as app_dur,
-               (sf.ts + sf.dur - fs.ts) as dur,
-               (fs.ts - TR.start_ts) AS ts,
-               fs.type,
-               (case when (sf.flag == 1 or fs.flag == 1 ) then true else false end) as jank_tag,
-               pro.pid,
-               pro.name as cmdline,
-               (sf.ts - TR.start_ts) AS rs_ts,
-               sf.vsync AS rs_vsync,
-               sf.dur AS rs_dur,
-               sf.ipid AS rs_ipid,
-               proc.pid AS rs_pid,
-               proc.name AS rs_name
-        FROM frame_slice AS fs
-                 LEFT JOIN process AS pro ON pro.id = fs.ipid
-                 LEFT JOIN frame_slice AS sf ON fs.dst = sf.id
-                 LEFT JOIN process AS proc ON proc.id = sf.ipid
-                 LEFT JOIN trace_range TR
-        WHERE fs.dst IS NOT NULL
-          AND fs.type = 0
-          AND fs.flag <> 2
-        UNION
-        SELECT
-               -1 as id,
-               'frameTime' as frame_type,
-               fs.ipid,
-               fs.vsync  as name,
-               fs.dur as app_dur,
-               fs.dur,
-               (fs.ts - TR.start_ts) AS ts,
-               fs.type,
-               fs.flag as jank_tag,
-               pro.pid,
-               pro.name as cmdline,
-               NULL AS rs_ts,
-               NULL AS rs_vsync,
-               NULL AS rs_dur,
-               NULL AS rs_ipid,
-               NULL AS rs_pid,
-               NULL AS rs_name
-        FROM frame_slice AS fs
-                 LEFT JOIN process AS pro ON pro.id = fs.ipid
-                 LEFT JOIN trace_range TR
-        WHERE fs.dst IS NULL
-          AND pro.name NOT LIKE '%render_service%'
-          AND fs.type = 0
-          AND fs.flag <> 2
-        ORDER BY ts;`
+    `SELECT
+         sf.id,
+         'frameTime' as frame_type,
+         fs.ipid,
+         fs.vsync as name,
+         fs.dur as app_dur,
+         (sf.ts + sf.dur - fs.ts) as dur,
+         (fs.ts - TR.start_ts) AS ts,
+         fs.type,
+         (case when (sf.flag == 1 or fs.flag == 1 ) then 1  when (sf.flag == 3 or fs.flag == 3 ) then 3 else 0 end) as jank_tag,
+         pro.pid,
+         pro.name as cmdline,
+         (sf.ts - TR.start_ts) AS rs_ts,
+         sf.vsync AS rs_vsync,
+         sf.dur AS rs_dur,
+         sf.ipid AS rs_ipid,
+         proc.pid AS rs_pid,
+         proc.name AS rs_name
+     FROM frame_slice AS fs
+              LEFT JOIN process AS pro ON pro.id = fs.ipid
+              LEFT JOIN frame_slice AS sf ON fs.dst = sf.id
+              LEFT JOIN process AS proc ON proc.id = sf.ipid
+              LEFT JOIN trace_range TR
+     WHERE fs.dst IS NOT NULL
+       AND fs.type = 0
+       AND fs.flag <> 2
+     UNION
+     SELECT
+         -1 as id,
+         'frameTime' as frame_type,
+         fs.ipid,
+         fs.vsync  as name,
+         fs.dur as app_dur,
+         fs.dur,
+         (fs.ts - TR.start_ts) AS ts,
+         fs.type,
+         fs.flag as jank_tag,
+         pro.pid,
+         pro.name as cmdline,
+         NULL AS rs_ts,
+         NULL AS rs_vsync,
+         NULL AS rs_dur,
+         NULL AS rs_ipid,
+         NULL AS rs_pid,
+         NULL AS rs_name
+     FROM frame_slice AS fs
+              LEFT JOIN process AS pro ON pro.id = fs.ipid
+              LEFT JOIN trace_range TR
+     WHERE fs.dst IS NULL
+       AND pro.name NOT LIKE '%render_service%'
+       AND fs.type = 0
+       AND fs.flag <> 2
+     ORDER BY ts;`
   );
 
 export const queryExpectedFrameDate = (): Promise<Array<any>> =>
@@ -3969,11 +3971,10 @@ export const queryGpuDur = (id: number): Promise<any> =>
 export const queryHeapFile = (): Promise<Array<FileInfo>> =>
   query(
     'queryHeapFile',
-    `SELECT f.id, f.file_name as name, f.start_time as startTs, f.end_time as endTs, f.pid, sum(n.self_size) as size
-    FROM js_heap_files f,trace_range t LEFT JOIN js_heap_nodes n on f.id = n.file_id
-    where (t.end_ts >= f.end_time and f.file_name != 'Timeline')
-    OR f.file_name = 'Timeline'
-    GROUP BY f.id`
+    `SELECT f.id, f.file_name as name, f.start_time as startTs, f.end_time as endTs, f.pid, f.self_size as size
+    FROM js_heap_files f,trace_range t
+    WHERE (t.end_ts >= f.end_time and f.file_name != 'Timeline')
+    OR f.file_name = 'Timeline'`
   );
 
 export const queryHeapInfo = (fileId: number): Promise<Array<any>> =>
diff --git a/ide/src/trace/database/TraceWorker.ts b/ide/src/trace/database/TraceWorker.ts
index 09b45c6923fff290a05e2923cb082250ea0adadf..b92819c7c2bafae4999b15d3ad0fc6cb4124e21a 100644
--- a/ide/src/trace/database/TraceWorker.ts
+++ b/ide/src/trace/database/TraceWorker.ts
@@ -93,6 +93,7 @@ function initThirdWASM(wasmFunctionName: string) {
       onAbort: () => {},
     });
   }
+
   return callModelFun(wasmFunctionName);
 }
 
@@ -110,8 +111,8 @@ let merged = () => {
   return mergedArray;
 };
 
-let translateJsonString = (str: string) => {
-  return str //    .padding
+let translateJsonString = (str: string): string => {
+  return str //   .padding
     .replace(/[\t|\r|\n]/g, '')
     .replace(/\\/g, '\\\\');
 };
@@ -371,67 +372,71 @@ self.onmessage = async (e: MessageEvent) => {
     let fn1 = Module.addFunction(getDownloadDb, 'viii');
     Module._WasmExportDatabase(fn1);
   } else if (e.data.action === 'upload-so') {
+    uploadSoActionId = e.data.id;
     let fileList = e.data.params as Array<File>;
     if (fileList) {
-      uploadSoFile(fileList, () => {
-        self.postMessage({
-          id: e.data.id,
-          action: e.data.action,
-          results: 'ok',
-        });
-      });
+      soFileList = fileList;
+      uploadFileIndex = 0;
+      if (!uploadSoCallbackFn) {
+        uploadSoCallbackFn = Module.addFunction(uploadSoCallBack, 'viii');
+      }
+      uploadSoFile(soFileList[uploadFileIndex]).then();
     }
   }
 };
 
+let uploadSoActionId: string = '';
 let uploadFileIndex: number = 0;
+let uploadSoCallbackFn: any;
+let soFileList : Array<File | null> = [];
+const uploadSoFile = async (file: File | null) => {
+  if (file) {
+    let fileNameBuffer: Uint8Array | null = enc.encode(file.webkitRelativePath);
+    let fileNameLength = fileNameBuffer.length;
+    let addr = Module._InitFileName(uploadSoCallbackFn, fileNameBuffer.length);
+    Module.HEAPU8.set(fileNameBuffer, addr);
+    let writeSize = 0;
+    let upRes = -1;
+    while (writeSize < file.size) {
+      let sliceLen = Math.min(file.size - writeSize, REQ_BUF_SIZE);
+      let blob: Blob | null = file.slice(writeSize,writeSize + sliceLen);
+      let buffer: ArrayBuffer | null = await blob.arrayBuffer();
+      let data: Uint8Array | null = new Uint8Array(buffer);
+      let size = file.size;
+      let lastFile = uploadFileIndex === soFileList.length - 1 ? 1 : 0
+      Module.HEAPU8.set(data, reqBufferAddr);
+      writeSize += sliceLen;
+      upRes = Module._TraceStreamerDownloadELFEx(size, fileNameLength, sliceLen, lastFile);
+      data = null;
+      buffer = null;
+      blob = null;
+    }
+    file = null;
+    soFileList[uploadFileIndex] = null;
+    fileNameBuffer = null;
+  }
+};
 
-function uploadSoFile(files: Array<File>, callback: () => void) {
-  let uploadFile = (file: File) => {
-    let reader = new FileReader();
-    reader.readAsArrayBuffer(file);
-    reader.onloadend = function (ev) {
-      if (this.result) {
-        let fileNameBuffer = enc.encode(file.webkitRelativePath);
-        let addr = Module._InitFileName(fn, fileNameBuffer.length);
-        Module.HEAPU8.set(fileNameBuffer, addr);
-        let data = new Uint8Array(this.result as ArrayBuffer);
-        let writeSize = 0;
-        let upRes = -1;
-        while (writeSize < data.length) {
-          const sliceLen = Math.min(data.length - writeSize, REQ_BUF_SIZE);
-          const dataSlice = data.subarray(writeSize, writeSize + sliceLen);
-          Module.HEAPU8.set(dataSlice, reqBufferAddr);
-          writeSize += sliceLen;
-          upRes = Module._TraceStreamerDownloadELFEx(
-            data.length,
-            fileNameBuffer.length,
-            sliceLen,
-            uploadFileIndex === files.length - 1 ? 1 : 0
-          );
-        }
-      }
-    };
-  };
-  let uploadSoCallBack = (heapPtr: number, size: number, isFinish: number) => {
-    let out: Uint8Array = Module.HEAPU8.slice(heapPtr, heapPtr + size);
+const uploadSoCallBack = (heapPtr: number, size: number, isFinish: number) => {
+  let out: Uint8Array | null = Module.HEAPU8.slice(heapPtr, heapPtr + size);
+  if (out) {
     let res = dec.decode(out);
+    out = null;
     if (res.includes('file send over')) {
-      if (uploadFileIndex < files.length - 1) {
+      if (uploadFileIndex < soFileList.length - 1) {
         uploadFileIndex = uploadFileIndex + 1;
-        uploadFile(files[uploadFileIndex]);
+        uploadSoFile(soFileList[uploadFileIndex]).then();
       }
+    } else {
+      soFileList.length = 0;
+      self.postMessage({
+        id: uploadSoActionId,
+        action: 'upload-so',
+        results: res.includes('ok') ? 'ok' : 'failed',
+      });
     }
-    if (res.includes('ok')) {
-      callback();
-    }
-  };
-  let fn = Module.addFunction(uploadSoCallBack, 'viii');
-  uploadFileIndex = 0;
-  if (files.length > 0) {
-    uploadFile(files[uploadFileIndex]);
   }
-}
+};
 
 function createView(sql: string) {
   let array = enc.encode(sql);
diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts
index b489a014ff42fd7c0412a214a0b67681625574f8..1ceb3c493751e2d57433ed5cf32e71f610f113bb 100644
--- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts
+++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts
@@ -349,6 +349,7 @@ export let translateJsonString = (str: string): string => {
     .replace(/[\t|\r|\n]/g, '')
     .replace(/\\/g, '\\\\');
 };
+
 export let convertJSON = (arrBuf: ArrayBuffer | Array<any>) => {
   if (arrBuf instanceof ArrayBuffer) {
     let string = dec.decode(arrBuf);
diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts
index 386a54958d45b694704bc767e5414d6161d847d8..fe80216bb047213fbaf6f5dc112276ea54ca788b 100644
--- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts
+++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts
@@ -781,7 +781,8 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql}
       currentNode.symbol =
         ProcedureLogicWorkerFileSystem.data_dict.get(currentNode.symbolsId) || currentNode.ip || 'unkown';
       currentNode.path = ProcedureLogicWorkerFileSystem.data_dict.get(currentNode.pathId) || 'unkown';
-      currentNode.libName = setFileName(currentNode.path);
+      currentNode.lib = currentNode.libName = setFileName(currentNode.path);
+      currentNode.addr = currentNode.ip;
       currentNode.symbolName = `${currentNode.symbol} (${currentNode.libName})`;
     }
   }
diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts
index 4276c006e454c27c496f3139d83571c181530562..e8005142d18fb3d5b874db8cdc0ea7c9183f4eeb 100644
--- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts
+++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts
@@ -221,7 +221,8 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler {
                     (case when h.event_type = 'AllocEvent' then 2 else 3 end) as eventType
                 from native_hook h ,trace_range t
                 where 
-                    h.end_ts between t.start_ts and t.end_ts
+                    h.start_ts between t.start_ts and t.end_ts
+                    and h.end_ts between t.start_ts and t.end_ts
                     and (h.event_type = 'AllocEvent' or h.event_type = 'MmapEvent')
             )
             order by startTime;
diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts
index ac2f82db2004ac70056aaf7bbeb9e07bfa91ee24..03d766f24bea1530b186451c5ffb37880eef71e7 100644
--- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts
+++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts
@@ -893,7 +893,9 @@ export class PerfCallChainMerageData extends ChartStruct {
       currentNode.pid = callChain.pid;
       currentNode.tid = callChain.tid;
       currentNode.libName = callChain.fileName;
+      currentNode.lib = callChain.fileName;
       currentNode.vaddrInFile = callChain.vaddrInFile;
+      currentNode.addr = '0x' + callChain.vaddrInFile.toString(16);
       currentNode.canCharge = callChain.canCharge;
       if (callChain.path) {
         currentNode.path = callChain.path;
@@ -918,8 +920,9 @@ export class PerfCallChainMerageData extends ChartStruct {
       currentNode.symbolName = callChain.name;
       currentNode.pid = sample.pid;
       currentNode.tid = sample.tid;
-      currentNode.libName = callChain.fileName;
+      currentNode.libName = currentNode.lib = callChain.fileName;
       currentNode.vaddrInFile = callChain.vaddrInFile;
+      currentNode.addr = '0x' + currentNode.vaddrInFile.toString(16);
       currentNode.canCharge = callChain.canCharge;
       if (callChain.path) {
         currentNode.path = callChain.path;
diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerSchedulingAnalysis.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerSchedulingAnalysis.ts
index 0522f3e70df3feadc0eb24f310f6605c530f4a70..279f577c898599b6a30f8a52d3b7380cb303ec67 100644
--- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerSchedulingAnalysis.ts
+++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerSchedulingAnalysis.ts
@@ -399,8 +399,8 @@ group by A.pid, A.tid,A.cpu`;
   queryThreadRunTime(cpuMax: number) {
     let sql = `
         select (row_number() over (order by max(A.dur) desc)) no,A.tid, A.cpu,A.ts as timestamp,A.pid, max(A.dur) maxDuration
-    from thread_state A
-    where cpu not null
+    from thread_state A, trace_range B
+    where cpu not null and A.ts between B.start_ts and B.end_ts
     group by A.tid, A.pid
     order by maxDuration desc
     limit 20`;
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorker.ts b/ide/src/trace/database/ui-worker/ProcedureWorker.ts
index aaf88b3a5d9bf63494ec3bd848d555998237cbb1..eb49ae522dc282de3269e1ff83fd13dd39385296 100644
--- a/ide/src/trace/database/ui-worker/ProcedureWorker.ts
+++ b/ide/src/trace/database/ui-worker/ProcedureWorker.ts
@@ -48,6 +48,7 @@ import { IrqRender } from './ProcedureWorkerIrq.js';
 import { JankRender } from './ProcedureWorkerJank.js';
 import { HeapTimelineRender } from './ProcedureWorkerHeapTimeline.js';
 import { HeapSnapshotRender } from './ProcedureWorkerHeapSnapshot.js';
+import { translateJsonString } from '../logic-worker/ProcedureLogicWorkerCommon.js';
 
 let dataList: any = {};
 let dataList2: any = {};
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerCPU.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerCPU.ts
index 75eed2ba4d59eff859145461d92fab1cdfe3c470..63af2899e5c52f7b64192485a64326e5b2182663 100644
--- a/ide/src/trace/database/ui-worker/ProcedureWorkerCPU.ts
+++ b/ide/src/trace/database/ui-worker/ProcedureWorkerCPU.ts
@@ -105,7 +105,7 @@ export class CpuRender {
     );
     for (let i = 0; i < SpSystemTrace.wakeupList.length; i++) {
       if (i + 1 == SpSystemTrace.wakeupList.length) {
-        return
+        return;
       }
       drawWakeUpList(
         req.context,
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts
index 7697dfecf7ad59d8defe8be8487b3cdfee115033..c4e8602d6374f15d43b11c4034bda66db90acb65 100644
--- a/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts
+++ b/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts
@@ -627,94 +627,6 @@ export function drawWakeUp(
   }
 }
 
-export function drawWakeUpList(
-  context: CanvasRenderingContext2D | any,
-  wake: WakeupBean | undefined | null,
-  startNS: number,
-  endNS: number,
-  totalNS: number,
-  frame: Rect,
-  wakeup: WakeupBean | undefined = undefined,
-  currentCpu: number | undefined | null = undefined,
-  noVerticalLine = false,
-) {
-  if (wake) {
-    let x1 = Math.floor(
-      ns2x(wake.wakeupTime || 0, startNS, endNS, totalNS, frame)
-    );
-    context.beginPath();
-    context.lineWidth = 2;
-    context.fillStyle = '#000000';
-    if (x1 > 0 && x1 < frame.x + frame.width) {
-      if (!noVerticalLine) {
-        context.moveTo(x1, frame.y);
-        context.lineTo(x1, frame.y + frame.height);
-      }
-      if (currentCpu == wake.cpu) {
-        let centerY = Math.floor(frame.y + frame.height / 2);
-        context.moveTo(x1, centerY - 6);
-        context.lineTo(x1 + 4, centerY);
-        context.lineTo(x1, centerY + 6);
-        context.lineTo(x1 - 4, centerY);
-        context.lineTo(x1, centerY - 6);
-        context.fill();
-      }
-    }
-    if (wakeup) {
-      let x2 = Math.floor(
-        ns2x(
-          wakeup.ts || 0,
-          startNS,
-          endNS,
-          totalNS,
-          frame
-        )
-      );
-      let y = frame.y + frame.height - 10;
-      context.moveTo(x1, y);
-      context.lineTo(x2, y);
-      context.moveTo(x2, y - 25);
-      context.lineTo(x2, y + 5);
-
-      let s = ns2s(
-        (wakeup.ts || 0) - (wake.wakeupTime || 0)
-      );
-      let distance = x2 - x1;
-      if (distance > 12) {
-        context.moveTo(x1, y);
-        context.lineTo(x1 + 6, y - 3);
-        context.moveTo(x1, y);
-        context.lineTo(x1 + 6, y + 3);
-        context.moveTo(x2, y);
-        context.lineTo(x2 - 6, y - 3);
-        context.moveTo(x2, y);
-        context.lineTo(x2 - 6, y + 3);
-        let measure = context.measureText(s);
-        let tHeight =
-          measure.actualBoundingBoxAscent +
-          measure.actualBoundingBoxDescent;
-        let xStart = x1 + Math.floor(distance / 2 - measure.width / 2);
-        if (distance > measure.width + 4) {
-          context.fillStyle = '#ffffff';
-          context.fillRect(
-            xStart - 2,
-            y - 4 - tHeight,
-            measure.width + 4,
-            tHeight + 4
-          );
-          context.font = '10px solid';
-          context.fillStyle = '#000000';
-          context.textBaseline = 'bottom';
-          context.fillText(s, xStart, y - 2);
-        }
-      }
-    }
-    context.strokeStyle = '#000000';
-    context.stroke();
-    context.closePath();
-  }
-}
-
 const wid = 5;
 const linkLineColor = '#ff0000';
 export function drawLinkLines(
@@ -1061,3 +973,91 @@ export function mem(
     }
   }
 }
+
+export function drawWakeUpList(
+  context: CanvasRenderingContext2D | any,
+  wake: WakeupBean | undefined | null,
+  startNS: number,
+  endNS: number,
+  totalNS: number,
+  frame: Rect,
+  wakeup: WakeupBean | undefined = undefined,
+  currentCpu: number | undefined | null = undefined,
+  noVerticalLine = false,
+) {
+  if (wake) {
+    let x1 = Math.floor(
+      ns2x(wake.wakeupTime || 0, startNS, endNS, totalNS, frame)
+    );
+    context.beginPath();
+    context.lineWidth = 2;
+    context.fillStyle = '#000000';
+    if (x1 > 0 && x1 < frame.x + frame.width) {
+      if (!noVerticalLine) {
+        context.moveTo(x1, frame.y);
+        context.lineTo(x1, frame.y + frame.height);
+      }
+      if (currentCpu == wake.cpu) {
+        let centerY = Math.floor(frame.y + frame.height / 2);
+        context.moveTo(x1, centerY - 6);
+        context.lineTo(x1 + 4, centerY);
+        context.lineTo(x1, centerY + 6);
+        context.lineTo(x1 - 4, centerY);
+        context.lineTo(x1, centerY - 6);
+        context.fill();
+      }
+    }
+    if (wakeup) {
+      let x2 = Math.floor(
+        ns2x(
+          wakeup.ts || 0,
+          startNS,
+          endNS,
+          totalNS,
+          frame
+        )
+      );
+      let y = frame.y + frame.height - 10;
+      context.moveTo(x1, y);
+      context.lineTo(x2, y);
+      context.moveTo(x2, y - 25);
+      context.lineTo(x2, y + 5);
+
+      let s = ns2s(
+        (wakeup.ts || 0) - (wake.wakeupTime || 0)
+      );
+      let distance = x2 - x1;
+      if (distance > 12) {
+        context.moveTo(x1, y);
+        context.lineTo(x1 + 6, y - 3);
+        context.moveTo(x1, y);
+        context.lineTo(x1 + 6, y + 3);
+        context.moveTo(x2, y);
+        context.lineTo(x2 - 6, y - 3);
+        context.moveTo(x2, y);
+        context.lineTo(x2 - 6, y + 3);
+        let measure = context.measureText(s);
+        let tHeight =
+          measure.actualBoundingBoxAscent +
+          measure.actualBoundingBoxDescent;
+        let xStart = x1 + Math.floor(distance / 2 - measure.width / 2);
+        if (distance > measure.width + 4) {
+          context.fillStyle = '#ffffff';
+          context.fillRect(
+            xStart - 2,
+            y - 4 - tHeight,
+            measure.width + 4,
+            tHeight + 4
+          );
+          context.font = '10px solid';
+          context.fillStyle = '#000000';
+          context.textBaseline = 'bottom';
+          context.fillText(s, xStart, y - 2);
+        }
+      }
+    }
+    context.strokeStyle = '#000000';
+    context.stroke();
+    context.closePath();
+  }
+}
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerJank.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerJank.ts
index 10aa77ff3311a684e79f3155a77082402fac1915..f8ad6bd78b0d5e6e498cbb3a8d4fcb09ac6b42fc 100644
--- a/ide/src/trace/database/ui-worker/ProcedureWorkerJank.ts
+++ b/ide/src/trace/database/ui-worker/ProcedureWorkerJank.ts
@@ -149,8 +149,10 @@ export class JankStruct extends JanksStruct {
       } else {
         ctx.globalAlpha = 1;
         ctx.fillStyle = ColorUtils.JANK_COLOR[0];
-        if (data.jank_tag) {
+        if (data.jank_tag === 1) {
           ctx.fillStyle = ColorUtils.JANK_COLOR[2];
+        } else if (data.jank_tag === 3) {
+          ctx.fillStyle = ColorUtils.JANK_COLOR[3];
         }
         let miniHeight = 20;
         if (
@@ -163,41 +165,10 @@ export class JankStruct extends JanksStruct {
           ctx.globalAlpha = 0.7;
         }
         if (data.type == '0') {
-          ctx.fillStyle = ColorUtils.JANK_COLOR[0];
-          if (data.jank_tag) {
-            ctx.fillStyle = ColorUtils.JANK_COLOR[2];
-          }
-          ctx.fillRect(data.frame.x, data.frame.y, data.frame.width, miniHeight - padding * 2);
+          this.drawActualFrame(ctx, data, miniHeight);
         } else {
-          if (data.frame.width * nsScale < 1.5) {
-            ctx.fillStyle = '#FFFFFF';
-            ctx.fillRect(data.frame.x, data.frame.y, data.frame.width * nsScale, miniHeight - padding * 2);
-            ctx.fillStyle = ColorUtils.JANK_COLOR[0];
-            if (data.jank_tag) {
-              ctx.fillStyle = ColorUtils.JANK_COLOR[2];
-            }
-            ctx.fillRect(
-              data.frame.x + data.frame.width * nsScale,
-              data.frame.y,
-              data.frame.width - nsScale * 2,
-              miniHeight - padding * 2
-            );
-            ctx.fillStyle = '#FFFFFF';
-            ctx.fillRect(
-              data.frame.x + data.frame.width * nsScale + data.frame.width - nsScale * 2,
-              data.frame.y,
-              data.frame.width * nsScale,
-              miniHeight - padding * 2
-            );
-          } else {
-            ctx.fillStyle = ColorUtils.JANK_COLOR[0];
-            if (data.jank_tag) {
-              ctx.fillStyle = ColorUtils.JANK_COLOR[2];
-            }
-            ctx.fillRect(data.frame.x, data.frame.y, data.frame.width, miniHeight - padding * 2);
-          }
+          this.drawExpectedFrame(data, nsScale, ctx, miniHeight);
         }
-
         if (data.frame.width > 10) {
           ctx.fillStyle = '#fff';
           drawString(ctx, `${data.name || ''}`, 5, data.frame, data);
@@ -211,6 +182,47 @@ export class JankStruct extends JanksStruct {
     }
   }
 
+  private static drawExpectedFrame(
+    data: JankStruct,
+    nsScale: number,
+    ctx: CanvasRenderingContext2D,
+    miniHeight: number
+  ) {
+    if (data.frame && data.frame.width * nsScale < 1.5) {
+      ctx.fillStyle = '#FFFFFF';
+      ctx.fillRect(data.frame.x, data.frame.y, data.frame.width * nsScale, miniHeight - padding * 2);
+      ctx.fillStyle = ColorUtils.JANK_COLOR[0];
+      ctx.fillRect(
+        data.frame.x + data.frame.width * nsScale,
+        data.frame.y,
+        data.frame.width - nsScale * 2,
+        miniHeight - padding * 2
+      );
+      ctx.fillStyle = '#FFFFFF';
+      ctx.fillRect(
+        data.frame.x + data.frame.width * nsScale + data.frame.width - nsScale * 2,
+        data.frame.y,
+        data.frame.width * nsScale,
+        miniHeight - padding * 2
+      );
+    } else {
+      ctx.fillStyle = ColorUtils.JANK_COLOR[0];
+      if (data.frame) {
+        ctx.fillRect(data.frame.x, data.frame.y, data.frame.width, miniHeight - padding * 2);
+      }
+    }
+  }
+  private static drawActualFrame(ctx: CanvasRenderingContext2D, data: JankStruct, miniHeight: number) {
+    ctx.fillStyle = ColorUtils.JANK_COLOR[0];
+    if (data.jank_tag === 1) {
+      ctx.fillStyle = ColorUtils.JANK_COLOR[2];
+    } else if (data.jank_tag === 3) {
+      ctx.fillStyle = ColorUtils.JANK_COLOR[3];
+    }
+    if (data.frame) {
+      ctx.fillRect(data.frame.x, data.frame.y, data.frame.width, miniHeight - padding * 2);
+    }
+  }
   static isSelected(data: JankStruct): boolean {
     return (
       JankStruct.selectJankStruct != undefined &&
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerMem.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerMem.ts
index dfdf2916a4401e49ed94577f0e8428a5b0195da7..0b259a87a391492fd2adfa84365929d64641c1b3 100644
--- a/ide/src/trace/database/ui-worker/ProcedureWorkerMem.ts
+++ b/ide/src/trace/database/ui-worker/ProcedureWorkerMem.ts
@@ -160,17 +160,22 @@ export class ProcessMemStruct extends BaseProcessMemStruct {
         memContext.fill();
         memContext.globalAlpha = 1.0;
         memContext.stroke();
+        memContext.closePath();
         memContext.beginPath();
         memContext.moveTo(data.frame.x + 3, data.frame.y + data.frame.height - memDrawHeight);
         memContext.lineWidth = 3;
         memContext.lineTo(data.frame.x + width, data.frame.y + data.frame.height - memDrawHeight);
         memContext.stroke();
+        memContext.closePath();
       } else {
         memContext.globalAlpha = 0.6;
         memContext.lineWidth = 1;
         let drawHeight: number = ((data.value || 0) * (data.frame.height || 0) * 1.0) / (data.maxValue || 1);
         drawHeight = drawHeight > 0 ? drawHeight : 1;
         memContext.fillRect(data.frame.x, data.frame.y + data.frame.height - drawHeight, width, drawHeight);
+        memContext.lineWidth = 1;
+        memContext.globalAlpha = 1.0;
+        memContext.strokeRect(data.frame.x, data.frame.y + data.frame.height - drawHeight, width, drawHeight);
       }
     }
     memContext.globalAlpha = 1.0;
diff --git a/trace_streamer/.gn b/trace_streamer/.gn
index 814190914c15108ecabbd3f4413d318a85ba09d0..74c472e0b66e8d6288324e2e6cbc1e186ed89d8d 100644
--- a/trace_streamer/.gn
+++ b/trace_streamer/.gn
@@ -12,3 +12,4 @@
 # limitations under the License.
 
 buildconfig = "//gn/CONFIG.gn"
+script_executable = "/usr/bin/env"
\ No newline at end of file
diff --git a/trace_streamer/sdk/dubai_sdk/protos/BUILD.gn b/trace_streamer/.gn_unix
old mode 100755
new mode 100644
similarity index 40%
rename from trace_streamer/sdk/dubai_sdk/protos/BUILD.gn
rename to trace_streamer/.gn_unix
index 7ab1477c25875f52013def4b2662693d122d597c..74c472e0b66e8d6288324e2e6cbc1e186ed89d8d
--- a/trace_streamer/sdk/dubai_sdk/protos/BUILD.gn
+++ b/trace_streamer/.gn_unix
@@ -11,40 +11,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//build/ohos.gni")
-import("../../../build/ts.gni")
-OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR = "${THIRD_PARTY}/protobuf"
-proto_dir = "${THIRD_PARTY}/protogen"
-mock_dir = "$proto_dir/types/plugins/mock_data"
-config("ts_proto_include_config") {
-  include_dirs = []
-}
-source_set("ts_proto_data_cpp") {
-  public_deps = [
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
-  ]
-  cflags = [
-    "-ftrapv",
-    "-D_FORTIFY_SOURCE=2 -O2",
-    "-Wno-zero-length-array",
-    "-std=c++17",
-  ]
-
-  if (!is_win) {
-    print("xxx")
-    cflags += [
-      "-fPIE",
-      "-fPIC",
-    ]
-  }
-  if (!use_wasm) {
-    cflags += [
-      "-fstack-protector-strong",  #
-      "-fstack-protector-all",
-    ]
-  }
-
-  public_configs = [ ":ts_proto_include_config" ]
-  sources = [ "${mock_dir}/mock_plugin_result.pb.cc" ]
-}
+buildconfig = "//gn/CONFIG.gn"
+script_executable = "/usr/bin/env"
\ No newline at end of file
diff --git a/trace_streamer/.gn_win b/trace_streamer/.gn_win
new file mode 100644
index 0000000000000000000000000000000000000000..5d10241c5c8409be25d789065605bf85a19f8424
--- /dev/null
+++ b/trace_streamer/.gn_win
@@ -0,0 +1,14 @@
+# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+buildconfig = "//gn/CONFIG.gn"
\ No newline at end of file
diff --git a/trace_streamer/build.sh b/trace_streamer/build.sh
index 256fc481ba4ac353f3fec42075effb33332f99cf..7f00ce90086f970216a59eed2f7be490821943cb 100755
--- a/trace_streamer/build.sh
+++ b/trace_streamer/build.sh
@@ -17,6 +17,7 @@ echo $PARAMS
 echo "begin to check input"
 SOURCE="${BASH_SOURCE[0]}"
 cd $(dirname ${SOURCE})
+./clean.sh
 ./pare_third_party.sh
 target_os="linux"
 target_dir="linux"
@@ -37,11 +38,23 @@ esac
 usage="Usage: $basename $0 wasm/test/fuzz/protoc debug/release/clean"
 
 ./dl_tools.sh $gn_path
-if [ ! -f "out/$target_os/protoc" ] && [ "$1" != "protoc" ];then
-    ./build.sh protoc
+
+if { [ "$1" == "dubaisdk" ] || [ "$1" == "sdkdemo" ] || [ "$1" == "wasm" ] || [ "$1" == "test" ] || [ "$1" == "fuzz" ]; } && [ "$#" -ne 0 ];then
+    if [ ! -f "out/$1/clang_x64/developtools/profiler/protoc" ] && [ "$1" != "protoc" ];then
+        ./build.sh protoc
+        mkdir -p out/$1/clang_x64/developtools/profiler
+        cp out/$target_os/clang_x64/developtools/profiler/protoc out/$1/clang_x64/developtools/profiler/protoc
+    fi
+    if [ ! -f "out/$1/clang_x64/developtools/profiler/protoreader_plugin" ] && [ "$1" != "spb" ] && [ -f "out/$1/clang_x64/developtools/profiler/protoc" ];then
+        ./build.sh spb
+        mkdir -p out/$1/clang_x64/developtools/profiler
+        cp out/$target_os/clang_x64/developtools/profiler/protoreader_plugin out/$1/clang_x64/developtools/profiler/protoreader_plugin
+    fi
 fi
-if [ ! -f "out/$target_os/protoreader_plugin" ] && [ "$1" != "spb" ] && [ -f "out/$target_os/protoc" ];then
-    ./build.sh spb
+if [ $target_os == "windows" ];then
+    cp .gn_win .gn
+else
+    cp .gn_unix .gn
 fi
 if [ "$1" == "windows" ];then
     echo "gn only support linux and wasm build currently"
diff --git a/trace_streamer/build/config.gni b/trace_streamer/build/config.gni
new file mode 100644
index 0000000000000000000000000000000000000000..f11538dc9287ef6c83a86717ec401ca1c4f155bb
--- /dev/null
+++ b/trace_streamer/build/config.gni
@@ -0,0 +1,34 @@
+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import("ts.gni")
+asdk_libs_dir="."
+host_toolchain = ""
+OHOS_TRACE_STREAMER_PROTOS_DIR = get_path_info("../src", "abspath")
+OHOS_PROFILER_3RDPARTY_DIR = get_path_info("../third_party/", "abspath")
+OHOS_PROFILER_3RDPARTY_GRPC_DIR = "${OHOS_PROFILER_3RDPARTY_DIR}/grpc"
+OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR = "${OHOS_PROFILER_3RDPARTY_DIR}/protobuf"
+OHOS_PROFILER_3RDPARTY_GOOGLETEST_DIR =
+    "${OHOS_PROFILER_3RDPARTY_DIR}/googletest"
+
+OHOS_PROFILER_SUBSYS_NAME = "developtools"
+OHOS_PROFILER_PART_NAME = "profiler"
+OHOS_PROFILER_TEST_MODULE_OUTPUT_PATH = "profiler"
+
+build_l2 = false
+if (getenv("BUILD_L2") == "true") {
+  build_l2 = true
+}
+
+declare_args() {
+  profiler_SmartPerf = true
+}
diff --git a/trace_streamer/build/make_standard_proto.py b/trace_streamer/build/make_standard_proto.py
new file mode 100755
index 0000000000000000000000000000000000000000..ba5e57398e8e0d74da0afad260d5fc3c38746f1a
--- /dev/null
+++ b/trace_streamer/build/make_standard_proto.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import os
+import sys
+import shutil
+
+def replace_lite_option(target_path, protofilepath):
+    target_file_path = os.path.basename(protofilepath)
+    target_file_path = target_path + '/' + target_file_path.replace(".proto", "_standard.proto")
+    # print("-------",target_path, target_file_path, protofilepath)
+    os.makedirs(target_path, exist_ok=True)
+    # os.makedirs(target_path)
+    shutil.copyfile(protofilepath, target_file_path)
+    # replease lite flag, import file name, add package name
+    with open(target_file_path, 'r+') as content:
+        newcontent = content.read()
+        newcontent = newcontent.replace('option optimize_for = LITE_RUNTIME;\n', '')
+        newcontent = newcontent.replace('syntax = "proto3";', 'syntax = "proto3";\npackage ForStandard;')
+        newcontent = newcontent.replace('.proto";', '_standard.proto";')
+        content.seek(0, 0)
+        content.write(newcontent)
+        content.truncate()
+        content.close()
+
+def main():
+    target_dir = sys.argv[1]
+    i = 2
+    while i < len(sys.argv):
+        proto_file_path = sys.argv[i]
+        replace_lite_option(target_dir, proto_file_path)
+        i += 1
+
+if __name__ == '__main__':
+    main()
diff --git a/trace_streamer/build/ohos.gni b/trace_streamer/build/ohos.gni
index dbad1dc962646897b1e346d924874212c88d22ab..cb277267cce5378bc18fcf6d6581a673d34656f7 100644
--- a/trace_streamer/build/ohos.gni
+++ b/trace_streamer/build/ohos.gni
@@ -12,10 +12,14 @@
 # limitations under the License.
 template("ohos_source_set") {
   source_set(target_name) {
-    part_name = invoker.part_name
-    subsystem_name = invoker.subsystem_name
-    print("part_name", part_name)
-    print("subsystem_name", subsystem_name)
+    if (defined(invoker.subsystem_name)) {
+      subsystem_name = invoker.subsystem_name
+      print("subsystem_name", subsystem_name)
+    }
+    if (defined(invoker.part_name)) {
+      part_name = invoker.part_name
+      print("part_name", part_name)
+    }
     if (defined(invoker.sources)) {
       sources = invoker.sources
     }
@@ -72,8 +76,14 @@ template("ohos_shared_library") {
   }
 }
 template("ohos_static_library") {
-  part_name = invoker.part_name
-  subsystem_name = invoker.subsystem_name
+    if (defined(invoker.subsystem_name)) {
+      subsystem_name = invoker.subsystem_name
+      print("subsystem_name", subsystem_name)
+    }
+    if (defined(invoker.part_name)) {
+      part_name = invoker.part_name
+      print("part_name", part_name)
+    }
   static_library(target_name) {
     sources = invoker.sources
     if (defined(invoker.configs)) {
@@ -98,8 +108,14 @@ template("ohos_static_library") {
   }
 }
 template("ohos_executable") {
-  part_name = invoker.part_name
-  subsystem_name = invoker.subsystem_name
+    if (defined(invoker.subsystem_name)) {
+      subsystem_name = invoker.subsystem_name
+      print("subsystem_name", subsystem_name)
+    }
+    if (defined(invoker.part_name)) {
+      part_name = invoker.part_name
+      print("part_name", part_name)
+    }
   executable(target_name) {
     if (defined(invoker.include_dirs)) {
       include_dirs = invoker.include_dirs
diff --git a/trace_streamer/build/protoc.sh b/trace_streamer/build/protoc.sh
old mode 100644
new mode 100755
index 8012b221cce151b4a22d5f1e417d5dc1b4771799..2dfdf6344faa9d1cd283f2269ff61ae7aa8d869a
--- a/trace_streamer/build/protoc.sh
+++ b/trace_streamer/build/protoc.sh
@@ -13,10 +13,74 @@
 # limitations under the License.
 
 set -e
-#echo "begin to protoc--------------"
-LIBCXX_X64_OUT="//out/linux"
-PROTOC="//out/linux/protoc"
+THIS_DIR=$(dirname ${BASH_SOURCE[0]})
+PROJECT_TOP=$(realpath $THIS_DIR/../../..)
+TAIL_DIR="developtools/profiler"
+if [[ $2 == *"developtools"* ]]; then
+  TAIL_DIR="."
+  PROJECT_TOP=$(realpath $THIS_DIR/..)
+fi
+OHOS_X64_OUT=$PROJECT_TOP/$2/
+LIBCXX_X64_OUT=$PROJECT_TOP/$1/ndk/libcxx/linux_x86_64
+SUBSYS_X64_OUT=$PROJECT_TOP/$2/$TAIL_DIR
+
+PROTOC=$PROJECT_TOP/$2/$TAIL_DIR/protoc
+OPT_PLUGIN_PROTOREADER_PATH=$PROJECT_TOP/$2/$TAIL_DIR/protoreader_plugin
+OPT_PLUGIN_PROTOREADER="--plugin=protoc-gen-plugin=$PROJECT_TOP/$2/$TAIL_DIR/protoreader_plugin --plugin_out=wrapper_namespace=ProtoReader"
+OPT_OUT=--opt_out
+OPT_PROTOREADER_OUT=--cpp_out
+PYTHON_SHELL=$THIS_DIR/make_standard_proto.py # shell path
+TMP=$2
+PROTO_OUT_DIR="$PROJECT_TOP/${TMP%/*}/$3" # path of the new proto file
+
+echo "1 = $1"
+echo "2 = $2"
+echo "3 = $3"
+echo "4 = $4"
+echo "5 = $5"
+echo "6 = $6"
+echo "7 = $7"
+echo "8 = $8"
+echo "9 = $9"
+echo "---OPT_PLUGIN_PROTOREADER_PATH = $OPT_PLUGIN_PROTOREADER_PATH"
 PARAMS=$*
-PARAMS_FILTER="$1 $2"
-#echo "EXEC: LD_LIBRARY_PATH=$LIBCXX_X64_OUT:$PROTOC ${PARAMS[@]:${#PARAMS_FILTER}}"
-LD_LIBRARY_PATH=$LIBCXX_X64_OUT exec $PROTOC ${PARAMS[@]:${#PARAMS_FILTER}}
+echo "PARAMS = $PARAMS"
+PARAMS_FILTER="$1 $2 $3"
+# for python : copy and change source .proto file
+TARFLAG="--proto_path"
+PARAMS_SOURCE_TMP="${PARAMS#*${TARFLAG}}" # get source proto file path
+PARAMS_SOURCES=""
+NUM=0
+for ITM in ${PARAMS_SOURCE_TMP[@]} # filter the TARGLAG
+do
+  if [ $NUM -gt 0 ]; then
+    PARAMS_SOURCES="$PARAMS_SOURCES$ITM "
+  fi
+  NUM=$[$NUM + 1]
+done
+PARAMS_PRINT="$PROTO_OUT_DIR $PARAMS_SOURCES" # splice the python args
+# echo "EXEC: python $PYTHON_SHELL $PARAMS_PRINT"
+python3 $PYTHON_SHELL $PARAMS_PRINT
+# end python
+
+# creat pb file
+PARAMS_SRC=${PARAMS:${#PARAMS_FILTER}}
+PARAMS_REPLACE=${PARAMS_SOURCES//.proto/_standard.proto} # make the new proto file name. like "_standard.proto"
+PARAMS_STANDARD=" --proto_path $PROTO_OUT_DIR " # add proto_path，$PROTO_OUT_DIR is the pb file path
+for VAR in ${PARAMS_REPLACE[@]}
+do
+  PARAMS_STANDARD="$PARAMS_STANDARD$PROTO_OUT_DIR/${VAR##*/} " # add .proto file name to args
+done
+PARAMS_ALL="$PARAMS_SRC $PARAMS_STANDARD" # add new argument list to old argument list
+
+# avoid conflict, param4=--plugin* means ipc plugin, generate encode file if opt plugin exist
+if [[ $4 != --plugin* ]]; then
+  if [ -f "$OPT_PLUGIN_PROTOREADER_PATH" ]; then
+    echo "generate protobuf optimize code OPT_PLUGIN_PROTOREADER = $OPT_PLUGIN_PROTOREADER"
+    LD_LIBRARY_PATH=$LIBCXX_X64_OUT:$SUBSYS_X64_OUT exec $PROTOC $OPT_PLUGIN_PROTOREADER:$5 $PARAMS_ALL
+    echo "start---$PROTOC $OPT_PLUGIN_PROTOREADER:$5 $PARAMS_ALL---end"
+  fi
+fi
+
+echo "EXEC: LD_LIBRARY_PATH=$LIBCXX_X64_OUT:$SUBSYS_X64_OUT $PROTOC $PARAMS_ALL"
+LD_LIBRARY_PATH=$LIBCXX_X64_OUT:$SUBSYS_X64_OUT exec $PROTOC $PARAMS_ALL
diff --git a/trace_streamer/build/protoc_w.sh b/trace_streamer/build/protoc_w.sh
new file mode 100644
index 0000000000000000000000000000000000000000..ebc7a8adecb958b818fa1c255fdc0828da45de03
--- /dev/null
+++ b/trace_streamer/build/protoc_w.sh
@@ -0,0 +1,80 @@
+# Copyright (c) 2023 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import subprocess
+import sys
+import platform
+
+THIS_DIR = os.path.dirname(os.path.abspath(__file__))
+PROJECT_TOP = os.path.realpath(os.path.join(THIS_DIR, "../../.."))
+TAIL_DIR = "developtools/profiler"
+
+if "developtools" in sys.argv[2]:
+    TAIL_DIR = "."
+    PROJECT_TOP = os.path.realpath(os.path.join(THIS_DIR, ".."))
+
+OHOS_X64_OUT = os.path.join(PROJECT_TOP, sys.argv[2])
+LIBCXX_X64_OUT = os.path.join(PROJECT_TOP, sys.argv[1], "ndk/libcxx/linux_x86_64")
+SUBSYS_X64_OUT = os.path.join(PROJECT_TOP, sys.argv[2], TAIL_DIR)
+PROTOC_NAME = "protoc"
+PROTOCREADER_PLUGIN = "protoreader_plugin"
+current_os = platform.system()
+if current_os == "Windows":
+    PROTOC_NAME = "protoc.exe"
+    PROTOCREADER_PLUGIN = "protoreader_plugin.exe"
+PROTOC = os.path.join(PROJECT_TOP, sys.argv[2], TAIL_DIR, PROTOC_NAME)
+OPT_PLUGIN_PROTOREADER_PATH = os.path.join(PROJECT_TOP, sys.argv[2], TAIL_DIR, PROTOCREADER_PLUGIN)
+OPT_PLUGIN_PROTOREADER = "--plugin=protoc-gen-plugin=" + os.path.join(PROJECT_TOP, sys.argv[2], TAIL_DIR, PROTOCREADER_PLUGIN)
+PLUGINOUT = "--plugin_out=wrapper_namespace=ProtoReader"
+OPT_OUT = "--opt_out"
+OPT_PROTOREADER_OUT = "--cpp_out"
+PYTHON_SHELL = os.path.join(THIS_DIR, "make_standard_proto.py")
+TMP = sys.argv[2]
+PROTO_OUT_DIR = os.path.join(PROJECT_TOP, os.path.dirname(TMP), sys.argv[3])
+
+print("1 =", sys.argv[1])
+print("2 =", sys.argv[2])
+print("3 =", sys.argv[3])
+print("4 =", sys.argv[4])
+print("5 =", sys.argv[5])
+print("6 =", sys.argv[6])
+print("7 =", sys.argv[7])
+print("8 =", sys.argv[8])
+print("9 =", sys.argv[9])
+print("---OPT_PLUGIN_PROTOREADER_PATH =", OPT_PLUGIN_PROTOREADER_PATH)
+PARAMS = sys.argv[1:]
+print("PARAMS =", PARAMS)
+PARAMS_FILTER = " ".join(sys.argv[1:4])
+TARFLAG = "--proto_path"
+PARAMS_SOURCE_TMP = [arg for arg in PARAMS if arg.startswith(TARFLAG)][0].split()[1:]  # get source proto file path
+PARAMS_SOURCES = " ".join(PARAMS_SOURCE_TMP[1:])  # filter the TARFLAG
+PARAMS_PRINT = f"{PROTO_OUT_DIR} {PARAMS_SOURCES}"  # splice the python args
+
+subprocess.run(["python3", PYTHON_SHELL, *PARAMS_PRINT.split()])
+
+PARAMS_SRC = " ".join(PARAMS).replace(PARAMS_FILTER, "")
+PARAMS_REPLACE = [param.replace(".proto", "_standard.proto") for param in PARAMS_SOURCE_TMP]
+PARAMS_STANDARD = f" --proto_path {PROTO_OUT_DIR} "
+PARAMS_STANDARD += " ".join([f"{PROTO_OUT_DIR}/{os.path.basename(param)}" for param in PARAMS_REPLACE])
+PARAMS_ALL = f"{PARAMS_SRC} {PARAMS_STANDARD}"
+
+print("执行参数：--------------- --------------------------")
+if not sys.argv[4].startswith("--plugin"):
+    print("执行参数：--------------- -------------------2-------")
+    if os.path.isfile(OPT_PLUGIN_PROTOREADER_PATH):
+      cmd=[PROTOC, OPT_PLUGIN_PROTOREADER, f"{PLUGINOUT}:{sys.argv[5]}", *PARAMS_ALL.split()]
+      print("执行参数：--------------- ", cmd, " --------------------------")
+      subprocess.run(cmd)
+    #   subprocess.run(cmd, env={"LD_LIBRARY_PATH": f"{LIBCXX_X64_OUT}:{SUBSYS_X64_OUT}"})
+subprocess.run([PROTOC, *PARAMS_ALL.split()])
diff --git a/trace_streamer/build/test.gni b/trace_streamer/build/test.gni
index 8bdf099d0885508f019e08b7d705a0acd5ea229e..5bad2529076992ed00c0457fadec69acc3fb30db 100644
--- a/trace_streamer/build/test.gni
+++ b/trace_streamer/build/test.gni
@@ -18,6 +18,14 @@ template("ohos_unittest") {
   executable(target_name) {
     forward_variables_from(invoker, "*")
     testonly = true
+
+    if (defined(invoker.deps)) {
+      deps += invoker.deps
+    }
+
+    if (defined(invoker.public_deps)) {
+      public_deps += invoker.public_deps
+    }
     if (defined(invoker.ldflags)) {
       print(invoker.ldflags)
     }
diff --git a/trace_streamer/build/ts.gni b/trace_streamer/build/ts.gni
index 2074e1be5a4523469631f38941ec954517ce025f..b15b99276caf0ed973db90dc6afbab3c2f288afe 100755
--- a/trace_streamer/build/ts.gni
+++ b/trace_streamer/build/ts.gni
@@ -10,30 +10,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-OHOS_PROTO_DIR = ""
-THIRD_PARTY = "//third_party"
-SRC = "//src"
-PREBUILTS = "//prebuilts"
+# import("config.gni")
 if (target_os == "linux" || target_os == "macx" || target_os == "windows") {
-  #  OHOS_FTRACE_PROTO_DIR="//third_party/protogen"
-  OHOS_FTRACE_PROTO_DIR = "//src/multi_platform"
-
-  #  OHOS_MEMORY_PROTO_DIR="//third_party/protogen"
-  OHOS_MEMORY_PROTO_DIR = "//src/multi_platform"
-
-  #  OHOS_HILOG_PROTO_DIR="//third_party/protogen"
-  OHOS_HILOG_PROTO_DIR = "//src/multi_platform"
-
-  #  OHOS_NATIVE_HOOK_PROTO_DIR="//third_party/protogen"
-  OHOS_NATIVE_HOOK_PROTO_DIR = "//src/multi_platform"
-
-  #  OHOS_HIDUMP_PROTO_DIR="//third_party/protogen"
-  OHOS_HIDUMP_PROTO_DIR = "//src/multi_platform"
-
-  #  OHOS_SERVICE_PROTO_DIR = "//third_party/protogen"
-  OHOS_SERVICE_PROTO_DIR = "//src/multi_platform"
-  OHOS_PROTO_GEN = "//third_party/protogen"
 
+  clang_x64_folder = "."
+  THIRD_PARTY = "//third_party"
+  SRC = "//src"
+  PREBUILTS = "//prebuilts"
   # kernel_version = "5.10.79_aarch64"
   kernel_version = "."
   if (target == "test") {
@@ -41,23 +24,46 @@ if (target_os == "linux" || target_os == "macx" || target_os == "windows") {
   } else {
     enable_ts_utest = false
   }
-  is_openharmony = false
+  device_kernel_version = "default"
+  is_ohos = false
+  PERF_DIR = "//third_party"
+
+  OHOS_TRACE_STREAMER_PROTOS_DIR = get_path_info("../src", "abspath")
+  OHOS_TRACE_STREAMER_DIR = get_path_info("../", "abspath")
+  OHOS_TRACE_STREAMER_DIR_PROTOC= get_path_info("./protoc.sh", "abspath")
+  
+  if (target_os == "windows") {
+    OHOS_TRACE_STREAMER_DIR_PROTOC= get_path_info("./protoc_w.sh", "abspath")
+  } else {
+  script_executable = "/usr/bin/env"
+  }
+  OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR = get_path_info("../third_party/protobuf", "abspath")
 } else {
-  enable_ts_utest = true
+  script_executable = "/usr/bin/env"
+  clang_x64_folder = "clang_x64"
+  with_ebpf_help_table = false
+  OHOS_TRACE_STREAMER_DIR = get_path_info("..", "abspath")
+  OHOS_TRACE_STREAMER_DIR_PROTOC= get_path_info("/protoc.sh", "abspath")
+  THIRD_PARTY = get_path_info("../../../../../../third_party/", "abspath")
+  PERF_DIR = get_path_info("../../../../../", "abspath")
+  SRC = "${OHOS_TRACE_STREAMER_DIR}/src"
+  PREBUILTS = "${OHOS_TRACE_STREAMER_DIR}/prebuilts"
+  target = "trace_steamer"
+  is_macx = false
+  with_perf = true
+  is_test = false
+  is_protoc = false
+  is_spb = false
+  is_sdkdemo = false
+  is_dubai_sdk = false
+  is_sdkdemo_test = false
   use_wasm = false
+  enable_ts_utest = true
   kernel_version = "."
   is_fuzz = false
   target = "trace_streamer"
-  is_openharmony = true
-  OHOS_FTRACE_PROTO_DIR = "//developtools/profiler/protos/types/plugins/ftrace_data/${kernel_version}"
-  OHOS_MEMORY_PROTO_DIR =
-      "//developtools/profiler/protos/types/plugins/memory_data"
-  OHOS_HILOG_PROTO_DIR =
-      "//developtools/profiler/protos/types/plugins/hilog_data"
-  OHOS_NATIVE_HOOK_PROTO_DIR =
-      "//developtools/profiler/protos/types/plugins/native_hook"
-  OHOS_HIDUMP_PROTO_DIR =
-      "//developtools/profiler/protos/types/plugins/hidump_data"
-  OHOS_SERVICE_PROTO_DIR = "//developtools/profiler/protos/services"
-  OHOS_PROTO_GEN = "//out/ohos-arm-release/gen/cpp/developtools/profiler/protos"
+  is_ohos = true
 }
+if (is_ohos) {
+  import("../../../../build/config.gni")
+}
\ No newline at end of file
diff --git a/trace_streamer/build_operator.sh b/trace_streamer/build_operator.sh
index ec6721bb91b4bc3cfa97e69f3fb204739826d7c7..ac4a134e4bead3717f1150ecb2732e4000fbc595 100755
--- a/trace_streamer/build_operator.sh
+++ b/trace_streamer/build_operator.sh
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 set -e
-ext=""
+ext="/clang_x64"
 target_dir="linux"
+subsys_name="developtools"
+part_name="profiler"
 is_debug="$1"
 target="$2"
 target_os="$3"
@@ -60,34 +62,29 @@ fi
 if [ "$is_debug" != "false" ];then
        	ext="_debug"
 fi
-if [ ! -d "third_party/protogen" ] && [ "$target" != "spb" ] && [ "$target" != "protoc" ];then
-    ./src/protos/protogen.sh
-fi
 
 if [ "$target" == "test" ] || [ "$target" == "fuzz" ] || [ "$target"="wasm" ] || [ "$target"="sdkdemo" ] || [ "$target"="sdkdemotest" ];then
     target_dir=$target
 else
     target_dir=$target_os
 fi
-if [ "$target" == "trace_streamer" ] || [ "$target" == "trace" ] || [ "$target" == "spb" ];then
+if [ "$target" == "trace_streamer" ] || [ "$target" == "trace" ] || [ "$target" == "spb" ] || [ "$target" == "protoc" ];then
     target_dir=$target_os
 fi
 echo "target_dir:" $target_dir
 echo "target:" $target
 # exit
 if [ "$is_clean" == "true"  ];then
-    prebuilts/$gn_path/$gn gen out/"$target_dir""$ext" --clean
-    prebuilts/$gn_path/$ninja -C out/"$target_dir""$ext" -t clean
+    prebuilts/$gn_path/$gn gen out/"$target_dir""$ext"/$subsys_name/$part_name --clean
+    prebuilts/$gn_path/$ninja -C out/"$target_dir""$ext"/$subsys_name/$part_name -t clean
 else
-    prebuilts/$gn_path/$gn gen out/"$target_dir""$ext" --args='is_debug='"$is_debug"' target="'"$target"'" target_os="'"$target_os"'"'
+    prebuilts/$gn_path/$gn gen out/"$target_dir""$ext"/$subsys_name/$part_name --args='is_debug='"$is_debug"' target="'"$target"'" target_os="'"$target_os"'"'
     echo "begin to build ..."
     mkdir -p out/windows
     touch out/windows/trace_streamer.exe
-    prebuilts/$gn_path/$ninja -C out/"$target_dir""$ext"
-    if [ "$target_dir" == "protoc" ];then
-        if [ ! -d "out/$target_os" ];then
-            mkdir -p "out/$target_os"
-        fi
-        mv out/"$target_dir""$ext"/$target_dir out/$target_os/
+    prebuilts/$gn_path/$ninja -C out/"$target_dir""$ext"/$subsys_name/$part_name
+    if [ $target_dir == "linux" ] && [ -f "out/$target_dir$ext/$subsys_name/$part_name/trace_streamer" ];then
+        mkdir -p out/linux
+        cp out/"$target_dir""$ext"/$subsys_name/$part_name/trace_streamer out/linux/
     fi
 fi
diff --git a/trace_streamer/clean.sh b/trace_streamer/clean.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8d19257074231abc59d646cf1eca08e721af33e6
--- /dev/null
+++ b/trace_streamer/clean.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# Copyright (c) 2023 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+set -e
+
+if [ -d "third_party" ];then
+    rm -rf third_party
+fi
\ No newline at end of file
diff --git a/trace_streamer/dl_emsdk.sh b/trace_streamer/dl_emsdk.sh
index a1ebccbce5e3becfe712be25fdabca847c1916e1..93520b20f6343781daea84b7f9384c3edda36b9f 100755
--- a/trace_streamer/dl_emsdk.sh
+++ b/trace_streamer/dl_emsdk.sh
@@ -22,7 +22,7 @@ if [ ! -d "prebuilts/emsdk" ];then
     fi
     if [ ! -d "tools/emsdk" ];then
         cd tools
-        git clone https://github.com/juj/emsdk.git --depth=1
+        git clone https://github.com/emscripten-core/emsdk.git --depth=1
         cd emsdk
         git pull
         ./emsdk install 3.1.12
diff --git a/trace_streamer/doc/frames.md b/trace_streamer/doc/frames.md
index 0909480dee62f4c2fa7397276cf1f1b725233f6d..a3491b05044620ca97f4eaf34c957293216db74b 100644
--- a/trace_streamer/doc/frames.md
+++ b/trace_streamer/doc/frames.md
@@ -6,17 +6,30 @@
 H:ReceiveVsync  
 H:OnVsyncEvent  
 H:MarshRSTransactionData  
-后面两个调用栈嵌套在H:ReceiveVsync内。  
+H:ReceiveVsync包含H:OnVsyncEvent, H:OnVsyncEvent包含H:MarshRSTransactionData.  
 特别地，当一个栈没有H:MarshRSTransactionData事件时，是无效的帧。  
-H:MarshRSTransactionData内会包含应用的帧标号，和线程号。  
+H:MarshRSTransactionData内会包含线程号和应用的帧标号。  例如： H:MarshRSTransactionData cmdCount:3 transactionFlag:[32402,146] 
 ## 渲染帧
 渲染帧会有下面一些调用栈：  
 H:ReceiveVsync  
 H:RSMainThread::OnVsync  
 H:RSMainThread::ProcessCommandUni  
-后面两个调用栈嵌套在H:ReceiveVsync内。  
+H:ReceiveVsync包含H:RSMainThread::OnVsync , H:RSMainThread::OnVsync包含H:RSMainThread::ProcessCommandUni.  
 特别地：当渲染帧不包含H:RSMainThread::ProcessCommandUni时，为无效的渲染帧。  
-H:RSMainThread::ProcessCommandUni内包含被渲染的帧编号，所属的线程号。  
+H:RSMainThread::ProcessCommandUni内包含被渲染帧所属的线程号和帧编号。例如： H:RSMainThread::ProcessCommandUni [32402,146]   
+## 应用帧和渲染帧关联
+应用帧和渲染帧通过H:MarshRSTransactionData和H:RSMainThread::ProcessCommandUni事件挟带的[tid, id]关联。  
+## 应用帧数据计算
+expect: 开始时间为应用帧H:ReceiveVsync事件中now字段指定的时间， 结束时间为end字段指定的时间。  
+        需要注意这里的now和end指定的时间并非boottime，需要经过时钟同步后使用。 在文本格式的数据中无时钟源信息，所以无法进行时钟同步。进而导致文本和htrace解析结果不一致。  
+actural: 开始时间为应用帧H:ReceiveVsync事件B子事件发生时间，结束时间为应用帧H:ReceiveVsync事件E子事件发生时间。  
+## 渲染帧数据计算
+expect: 开始时间为渲染帧H:ReceiveVsync事件中now字段指定的时间， 结束时间为end字段指定的时间。  
+        需要注意这里的now和end指定的时间并非boottime，需要经过时钟同步后使用。 在文本格式的数据中无时钟源信息，所以无法进行时钟同步。进而导致文本和htrace解析结果不一致。  
+actural: 开始时间为渲染帧H:ReceiveVsync事件B子事件发生时间，结束时间为渲染帧H:ReceiveVsync事件E子事件发生时间。  
+## FrameTimeline的数据计算
+expect: 开始时间为应用帧expect的开始时间， 结束时间为渲染帧expect的结束时间。  
+actrual: 开始时间为应用帧H:ReceiveVsync事件B子事件发生时间，结束时间为渲染帧H:ReceiveVsync事件E子事件发生时间。  
 ## GPU渲染时长
 和渲染帧同步并发的，是渲染线程的gpu信息，在事件中是H:M: Frame queued事件。  
 只有当H:M: Frame queued事件的开始时间在渲染帧的H:ReceiveVsync时间的开始到结束的时间范围时，将该H:M: Frame queued事件和H:ReceiveVsync做关联，两者构成一个完整的渲染事件（也可能没有H:M: Frame queued事件）。  
@@ -25,6 +38,7 @@ H:RSMainThread::ProcessCommandUni内包含被渲染的帧编号，所属的线
 关于帧卡顿的定义：帧的实际渲染时间晚于期望被渲染的时间，认为帧卡顿。数据库中标识为1，否则为0。  
 期望帧不做任何标识，为默认的255(max u8)，导出db时为空。  
 特别地：以上事件发出的线程，必须是进程中的主线程，即线程号和进程号一致，否则，不做处理。  
+另外，|渲染帧actural开始时间 -  应用帧actural结束时间| > 1ms时， 认为渲染状态异常。 数据库中标识为3.  
 ## 关于无效帧的定义
 如果应用帧不包含FrameNum，则其为无效帧。  
 无效帧的标识为2。  
diff --git a/trace_streamer/gn/BUILD.gn b/trace_streamer/gn/BUILD.gn
index 006acf33146a8f51d2290bb4a10b4f01e9951191..5a02ff778dbdd5be4a5c95b6d645661fa48fb373 100755
--- a/trace_streamer/gn/BUILD.gn
+++ b/trace_streamer/gn/BUILD.gn
@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import("../build/ts.gni")
 print("target_os", target_os)
 print("target_name", target)
 group("default_deps") {
@@ -208,7 +209,9 @@ config("executable") {
   if (!is_macx && !use_wasm && !is_win) {
     ldflags += [ "-pie" ]
   }
-
+  if (!is_macx) {
+    ldflags += [ "-Wl,--gc-sections" ]
+  }
   if (is_macx) {
     ldflags += [
       "-fdata-sections",
@@ -223,5 +226,4 @@ config("executable") {
   } else if (!is_debug && is_macx) {
     ldflags += [ "-dead_strip" ]
   }
-  ldflags += [ "-Wl,--gc-sections" ]
 }
diff --git a/trace_streamer/prebuilts/protos/BUILD.gn b/trace_streamer/prebuilts/protos/BUILD.gn
deleted file mode 100755
index 5aee40ff6ea0b75c570e3ac9ae5728176f0d01e1..0000000000000000000000000000000000000000
--- a/trace_streamer/prebuilts/protos/BUILD.gn
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build/ohos.gni")
-import("../../build/ts.gni")
-OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR = "${THIRD_PARTY}/protobuf"
-proto_dir = "${THIRD_PARTY}/protogen"
-services_dir = "$proto_dir/services"
-ftrace_data_dir = "$proto_dir/types/plugins/ftrace_data/${kernel_version}"
-js_memory_dir = "$proto_dir/types/plugins/js_memory"
-memory_data_dir = "$proto_dir/types/plugins/memory_data"
-hilog_data_dir = "$proto_dir/types/plugins/hilog_data"
-native_hook_dir = "$proto_dir/types/plugins/native_hook"
-hidump_data_dir = "$proto_dir/types/plugins/hidump_data"
-network_data_dir = "$proto_dir/types/plugins/network_data"
-cpu_data_dir = "$proto_dir/types/plugins/cpu_data"
-diskio_data_dir = "$proto_dir/types/plugins/diskio_data"
-process_data_dir = "$proto_dir/types/plugins/process_data"
-hisysevent_data_dir = "$proto_dir/types/plugins/hisysevent_data"
-test_data_dir = "$proto_dir/types/plugins/test_data"
-config("ts_proto_include_config") {
-  include_dirs = [
-    "$ftrace_data_dir",
-    "$js_memory_dir",
-    "$memory_data_dir",
-    "$hilog_data_dir",
-    "$native_hook_dir",
-    "$hidump_data_dir",
-    "$hisysevent_data_dir",
-    "$test_data_dir",
-  ]
-}
-source_set("ts_proto_data_cpp") {
-  public_deps = [
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
-  ]
-  cflags = [
-    "-ftrapv",
-    "-D_FORTIFY_SOURCE=2 -O2",
-    "-Wno-zero-length-array",
-    "-std=c++17",
-  ]
-
-  if (!is_win) {
-    cflags += [
-      "-fPIE",
-      "-fPIC",
-    ]
-  }
-  if (!use_wasm) {
-    cflags += [
-      "-fstack-protector-strong",  #
-      "-fstack-protector-all",
-    ]
-  }
-
-  public_configs = [ ":ts_proto_include_config" ]
-  sources = [
-    "$ftrace_data_dir/binder.pb.cc",
-    "$ftrace_data_dir/block.pb.cc",
-    "$ftrace_data_dir/cgroup.pb.cc",
-    "$ftrace_data_dir/clk.pb.cc",
-    "$ftrace_data_dir/compaction.pb.cc",
-    "$ftrace_data_dir/cpuhp.pb.cc",
-    "$ftrace_data_dir/dma_fence.pb.cc",
-    "$ftrace_data_dir/ext4.pb.cc",
-    "$ftrace_data_dir/filelock.pb.cc",
-    "$ftrace_data_dir/filemap.pb.cc",
-    "$ftrace_data_dir/ftrace.pb.cc",
-    "$ftrace_data_dir/ftrace_event.pb.cc",
-    "$ftrace_data_dir/gpio.pb.cc",
-    "$ftrace_data_dir/i2c.pb.cc",
-    "$ftrace_data_dir/ipi.pb.cc",
-    "$ftrace_data_dir/irq.pb.cc",
-    "$ftrace_data_dir/kmem.pb.cc",
-    "$ftrace_data_dir/net.pb.cc",
-
-    # "$ftrace_data_dir/mmc.pb.cc",
-    # "$ftrace_data_dir/f2fs.pb.cc",
-    # "$ftrace_data_dir/gpu_mem.pb.cc",
-    # "$ftrace_data_dir/regulator.pb.cc",
-    "$ftrace_data_dir/oom.pb.cc",
-    "$ftrace_data_dir/pagemap.pb.cc",
-    "$ftrace_data_dir/power.pb.cc",
-    "$ftrace_data_dir/printk.pb.cc",
-    "$ftrace_data_dir/raw_syscalls.pb.cc",
-    "$ftrace_data_dir/rcu.pb.cc",
-    "$ftrace_data_dir/sched.pb.cc",
-    "$ftrace_data_dir/signal.pb.cc",
-    "$ftrace_data_dir/sunrpc.pb.cc",
-    "$ftrace_data_dir/task.pb.cc",
-    "$ftrace_data_dir/timer.pb.cc",
-    "$ftrace_data_dir/trace_plugin_result.pb.cc",
-    "$ftrace_data_dir/v4l2.pb.cc",
-    "$ftrace_data_dir/vmscan.pb.cc",
-    "$ftrace_data_dir/workqueue.pb.cc",
-    "$ftrace_data_dir/writeback.pb.cc",
-    "$hidump_data_dir/hidump_plugin_result.pb.cc",
-    "$hilog_data_dir/hilog_plugin_result.pb.cc",
-    "$memory_data_dir/memory_plugin_common.pb.cc",
-    "$memory_data_dir/memory_plugin_config.pb.cc",
-    "$memory_data_dir/memory_plugin_result.pb.cc",
-    "$native_hook_dir/native_hook_config.pb.cc",
-    "$native_hook_dir/native_hook_result.pb.cc",
-    "${cpu_data_dir}/cpu_plugin_result.pb.cc",
-    "${diskio_data_dir}/diskio_plugin_result.pb.cc",
-    "${hisysevent_data_dir}/hisysevent_plugin_config.pb.cc",
-    "${hisysevent_data_dir}/hisysevent_plugin_result.pb.cc",
-    "${network_data_dir}/network_plugin_result.pb.cc",
-    "${process_data_dir}/process_plugin_result.pb.cc",
-    "${services_dir}/common_types.pb.cc",
-  ]
-}
\ No newline at end of file
diff --git a/trace_streamer/sdk/demo_sdk/BUILD.gn b/trace_streamer/sdk/demo_sdk/BUILD.gn
index 653b6e0014cceeb05be517081f0cdb8b1b2d6999..498c279f9c8f0c6166c83c1eb638d4d6f5403706 100755
--- a/trace_streamer/sdk/demo_sdk/BUILD.gn
+++ b/trace_streamer/sdk/demo_sdk/BUILD.gn
@@ -23,7 +23,6 @@ if (use_wasm) {
     sources = []
     include_dirs = []
     deps = []
-    public_deps = []
   }
 }
 ohos_source_set("lib") {
@@ -37,7 +36,6 @@ ohos_source_set("lib") {
     ":trace_streamer_sdk",
     "${THIRD_PARTY}/protobuf:protobuf",
     "${THIRD_PARTY}/protobuf:protobuf_lite",
-    "protos:ts_proto_data_cpp",
   ]
   include_dirs = [
     "${SRC}/base",
@@ -51,14 +49,12 @@ ohos_source_set("lib") {
     "./",
     "cfg",
     "${THIRD_PARTY}/sqlite/include",
-    "${OHOS_PROTO_GEN}/types/plugins/mock_data",
-    "${OHOS_PROTO_GEN}",
     "${THIRD_PARTY}/protobuf/src",
   ]
+  public_deps = [ "protos/types/plugins/mock_data:mock_data_cpp" ]
   if (with_perf) {
     include_dirs += []
   }
-  public_deps = []
 }
 ohos_source_set("trace_streamer_sdk") {
   subsystem_name = "trace_streamer"
@@ -111,8 +107,6 @@ ohos_source_set("trace_streamer_sdk") {
     "./",
     "cfg",
     "${THIRD_PARTY}/sqlite/include",
-    "${OHOS_PROTO_GEN}",
-    "${OHOS_PROTO_GEN}/types/plugins/mock_data",
     "${THIRD_PARTY}/protobuf/src",
     "${THIRD_PARTY}/json-master/single_include/nlohmann",
   ]
@@ -130,8 +124,8 @@ ohos_source_set("trace_streamer_sdk") {
     "${SRC}/base:base",
     "${THIRD_PARTY}/sqlite:sqlite",
     "plugin:sdk_plugin",
-    "protos:ts_proto_data_cpp",
   ]
+  public_deps = [ "protos/types/plugins/mock_data:mock_data_cpp" ]
   if (with_perf) {
   }
 
@@ -154,7 +148,6 @@ ohos_source_set("trace_streamer_sdk") {
       "--coverage",
     ]
   }
-  public_deps = []
 }
 if (use_wasm) {
   wasm_lib("trace_streamer_sdk_builtin_wasm") {
diff --git a/trace_streamer/sdk/demo_sdk/doc/wasm.md b/trace_streamer/sdk/demo_sdk/doc/wasm.md
index 2872ace529e1131ec632602d61626555d112ea32..0c2876b9e1816899915b5c07234cf56743c6045e 100644
--- a/trace_streamer/sdk/demo_sdk/doc/wasm.md
+++ b/trace_streamer/sdk/demo_sdk/doc/wasm.md
@@ -31,11 +31,11 @@ prebuilts/emsdk
 │   └── prebuilts/emsdk/emsdk/lib
 │       └── prebuilts/emsdk/emsdk/lib/clang
 └── prebuilts/emsdk/node
-    └── prebuilts/emsdk/node/16.20.0_64bit
-        ├── prebuilts/emsdk/node/16.20.0_64bit/bin
-        ├── prebuilts/emsdk/node/16.20.0_64bit/include
-        ├── prebuilts/emsdk/node/16.20.0_64bit/lib
-        └── prebuilts/emsdk/node/16.20.0_64bit/share
+    └── prebuilts/emsdk/node/14.18.2_64bit
+        ├── prebuilts/emsdk/node/14.18.2_64bit/bin
+        ├── prebuilts/emsdk/node/14.18.2_64bit/include
+        ├── prebuilts/emsdk/node/14.18.2_64bit/lib
+        └── prebuilts/emsdk/node/14.18.2_64bit/share
 ```
 之后调用
 ```
diff --git a/trace_streamer/sdk/demo_sdk/plugin/BUILD.gn b/trace_streamer/sdk/demo_sdk/plugin/BUILD.gn
index 7782fda13e9bc153b738b35fe5de57a04dba0254..3523d0cfca355a99d199e43070612e07ee0e09d3 100644
--- a/trace_streamer/sdk/demo_sdk/plugin/BUILD.gn
+++ b/trace_streamer/sdk/demo_sdk/plugin/BUILD.gn
@@ -31,5 +31,5 @@ ohos_source_set("sdk_plugin") {
     "${THIRD_PARTY}/protobuf/src",
   ]
 
-  public_deps = []
+  public_deps = [ "../protos/types/plugins/mock_data:mock_data_cpp" ]
 }
diff --git a/trace_streamer/sdk/demo_sdk/protos/protos.gni b/trace_streamer/sdk/demo_sdk/protos/protos.gni
index f8582402a8b542f4435fdeda2e18278b1bd725e7..09c4f2f77e8030ce411934efc93da68ec41e245b 100755
--- a/trace_streamer/sdk/demo_sdk/protos/protos.gni
+++ b/trace_streamer/sdk/demo_sdk/protos/protos.gni
@@ -11,21 +11,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../build/config.gni")
+import("../../../build/config.gni")
 
 subsys_name = OHOS_PROFILER_SUBSYS_NAME
 part_name = OHOS_PROFILER_PART_NAME
-subsys_x64_out = "clang_x64/$subsys_name/$part_name"
+
+# subsys_x64_out = "clang_x64/$subsys_name/$part_name"
 libc_dir_proto = rebase_path("$asdk_libs_dir", "//")
 root_output_dir_proto = rebase_path("$root_out_dir", "//")
 
 #host:clang_x64 default:arm mingw:mingw_x86_64
 if (current_toolchain != host_toolchain) {
   if (current_toolchain == default_toolchain) {
-    root_output_dir_proto = "$root_output_dir_proto/clang_x64"
+    root_output_dir_proto = "$root_output_dir_proto/$clang_x64_folder"
   } else {
     root_output_dir_proto =
-        get_path_info("$root_output_dir_proto", "dir") + "/clang_x64"
+        get_path_info("$root_output_dir_proto", "dir") + "/$clang_x64_folder"
   }
 }
 protoc = root_output_dir_proto
diff --git a/trace_streamer/sdk/demo_sdk/protos/types/plugins/mock_data/BUILD.gn b/trace_streamer/sdk/demo_sdk/protos/types/plugins/mock_data/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..d06e80472cc3ffa9d4ee55706cf1c1bce68ae52b
--- /dev/null
+++ b/trace_streamer/sdk/demo_sdk/protos/types/plugins/mock_data/BUILD.gn
@@ -0,0 +1,123 @@
+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+import("../../../protos.gni")
+
+mock_data_sources = [
+  "./mock_plugin_config.proto",
+  "./mock_plugin_result.proto",
+]
+
+#######################################################
+proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
+proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
+
+mock_data_codegen = []
+mock_data_codegen_standard = []
+mock_data_codegen_reader = []
+mock_data_codegen_all = []
+foreach(proto, mock_data_sources) {
+  name = get_path_info(proto, "name")
+  mock_data_codegen += [
+    "$proto_out_dir/$name.pb.h",
+    "$proto_out_dir/$name.pb.cc",
+  ]
+  mock_data_codegen_standard += [
+    "$proto_out_dir/${name}_standard.pb.h",
+    "$proto_out_dir/${name}_standard.pb.cc",
+  ]
+  mock_data_codegen_reader += [ "$proto_out_dir/$name.pbreader.h" ]
+}
+mock_data_codegen_all += mock_data_codegen
+mock_data_codegen_all += mock_data_codegen_standard
+mock_data_codegen_all += mock_data_codegen_reader
+
+mock_plugin_config_sources = [ "./mock_plugin_config.proto" ]
+mock_plugin_config_codegen_standard = []
+foreach(proto, mock_plugin_config_sources) {
+  name = get_path_info(proto, "name")
+  mock_plugin_config_codegen_standard += [
+    "$proto_out_dir/${name}_standard.pb.h",
+    "$proto_out_dir/${name}_standard.pb.cc",
+  ]
+}
+
+config("cpu_include_config") {
+  include_dirs = [ "$proto_out_dir" ]
+}
+
+#######################################################
+action("mock_data_cpp_gen") {
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
+  sources = mock_data_sources
+  outputs = mock_data_codegen_all
+  args = [
+    "$libc_dir_proto",
+    "$root_output_dir_proto",
+    "$proto_rel_out_dir",  # standard proto file destination path
+    "--cpp_out",
+    "$proto_rel_out_dir",
+    "--proto_path",
+    rebase_path(".", root_build_dir),
+  ]
+  args += rebase_path(sources, root_build_dir)
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
+}
+
+ohos_source_set("mock_data_cpp") {
+  deps = [ ":mock_data_cpp_gen" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":cpu_include_config" ]
+  sources = mock_data_codegen
+}
+
+ohos_source_set("mock_data_cpp_standard") {
+  deps = [ ":mock_data_cpp_gen" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":cpu_include_config" ]
+  sources = mock_data_codegen_standard
+}
+
+ohos_source_set("mock_plugin_config_cpp_standard") {
+  deps = [ ":mock_data_cpp_gen" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":cpu_include_config" ]
+  sources = mock_plugin_config_codegen_standard
+  subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
+  part_name = "${OHOS_PROFILER_PART_NAME}"
+}
+
+ohos_source_set("mock_data_encoder") {
+  deps = [ ":mock_data_cpp_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":cpu_include_config" ]
+  sources = mock_data_codegen_reader
+}
diff --git a/trace_streamer/sdk/demo_sdk/test/BUILD.gn b/trace_streamer/sdk/demo_sdk/test/BUILD.gn
index 34d13eac2419b2b13db1f4a3ff9b0960db337948..f4582c60304afce0201b7905ce54690412097528 100755
--- a/trace_streamer/sdk/demo_sdk/test/BUILD.gn
+++ b/trace_streamer/sdk/demo_sdk/test/BUILD.gn
@@ -19,7 +19,6 @@ if (target == "sdkdemotest") {
   ohos_unittest("trace_streamer_sdk_ut") {
     sources = [ "unittest/sdk_api_test.cpp" ]
     deps = [
-      "${PREBUILTS}/protos:ts_proto_data_cpp",
       "${THIRD_PARTY}/googletest:gtest",
       "${THIRD_PARTY}/googletest:gtest_main",
       "${THIRD_PARTY}/protobuf:protobuf",
diff --git a/trace_streamer/sdk/dubai_sdk/BUILD.gn b/trace_streamer/sdk/dubai_sdk/BUILD.gn
index 8f7a0212ea43f0cf2a49e828ea4da9705d4571e1..3f1f9124860bd3b9e49df24f312fd79f69bb4565 100755
--- a/trace_streamer/sdk/dubai_sdk/BUILD.gn
+++ b/trace_streamer/sdk/dubai_sdk/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../build/ohos.gni")
+import("//build/ohos.gni")
 import("../../build/ts.gni")
 if (use_wasm) {
   import("../../gn/wasm.gni")
@@ -37,7 +37,6 @@ ohos_source_set("lib") {
     ":trace_streamer_sdk",
     "${THIRD_PARTY}/protobuf:protobuf",
     "${THIRD_PARTY}/protobuf:protobuf_lite",
-    "protos:ts_proto_data_cpp",
   ]
   include_dirs = [
     "${SRC}/base",
@@ -51,14 +50,12 @@ ohos_source_set("lib") {
     "./",
     "cfg",
     "${THIRD_PARTY}/sqlite/include",
-    "${OHOS_PROTO_GEN}/types/plugins/mock_data",
-    "${OHOS_PROTO_GEN}",
     "${THIRD_PARTY}/protobuf/src",
   ]
   if (with_perf) {
     include_dirs += []
   }
-  public_deps = []
+  public_deps = [ "protos/types/plugins/mock_data:mock_data_cpp" ]
 }
 source_set("trace_streamer_sdk") {
   sources = [
@@ -109,8 +106,6 @@ source_set("trace_streamer_sdk") {
     "./",
     "cfg",
     "${THIRD_PARTY}/sqlite/include",
-    "${OHOS_PROTO_GEN}",
-    "${OHOS_PROTO_GEN}/types/plugins/mock_data",
     "${THIRD_PARTY}/protobuf/src",
     "${THIRD_PARTY}/json-master/single_include/nlohmann",
   ]
@@ -128,7 +123,6 @@ source_set("trace_streamer_sdk") {
     "${SRC}/base:base",
     "${THIRD_PARTY}/sqlite:sqlite",
     "plugin:sdk_plugin",
-    "protos:ts_proto_data_cpp",
   ]
   if (with_perf) {
   }
@@ -151,7 +145,7 @@ source_set("trace_streamer_sdk") {
       "--coverage",
     ]
   }
-  public_deps = []
+  public_deps = [ "protos/types/plugins/mock_data:mock_data_cpp" ]
 }
 if (use_wasm) {
   wasm_lib("trace_streamer_dubai_builtin_wasm") {
diff --git a/trace_streamer/sdk/dubai_sdk/doc/wasm.md b/trace_streamer/sdk/dubai_sdk/doc/wasm.md
index 2872ace529e1131ec632602d61626555d112ea32..0c2876b9e1816899915b5c07234cf56743c6045e 100755
--- a/trace_streamer/sdk/dubai_sdk/doc/wasm.md
+++ b/trace_streamer/sdk/dubai_sdk/doc/wasm.md
@@ -31,11 +31,11 @@ prebuilts/emsdk
 │   └── prebuilts/emsdk/emsdk/lib
 │       └── prebuilts/emsdk/emsdk/lib/clang
 └── prebuilts/emsdk/node
-    └── prebuilts/emsdk/node/16.20.0_64bit
-        ├── prebuilts/emsdk/node/16.20.0_64bit/bin
-        ├── prebuilts/emsdk/node/16.20.0_64bit/include
-        ├── prebuilts/emsdk/node/16.20.0_64bit/lib
-        └── prebuilts/emsdk/node/16.20.0_64bit/share
+    └── prebuilts/emsdk/node/14.18.2_64bit
+        ├── prebuilts/emsdk/node/14.18.2_64bit/bin
+        ├── prebuilts/emsdk/node/14.18.2_64bit/include
+        ├── prebuilts/emsdk/node/14.18.2_64bit/lib
+        └── prebuilts/emsdk/node/14.18.2_64bit/share
 ```
 之后调用
 ```
diff --git a/trace_streamer/sdk/dubai_sdk/plugin/BUILD.gn b/trace_streamer/sdk/dubai_sdk/plugin/BUILD.gn
index e31b9596c9d6528439c92861a13ce1a058484e27..0afad64197e8258efb464367f5c6531ea8050e73 100755
--- a/trace_streamer/sdk/dubai_sdk/plugin/BUILD.gn
+++ b/trace_streamer/sdk/dubai_sdk/plugin/BUILD.gn
@@ -31,5 +31,5 @@ ohos_source_set("sdk_plugin") {
     "${THIRD_PARTY}/protobuf/src",
   ]
 
-  public_deps = []
+  public_deps = [ "../protos/types/plugins/mock_data:mock_data_cpp" ]
 }
diff --git a/trace_streamer/sdk/dubai_sdk/protos/protos.gni b/trace_streamer/sdk/dubai_sdk/protos/protos.gni
index f8582402a8b542f4435fdeda2e18278b1bd725e7..09c4f2f77e8030ce411934efc93da68ec41e245b 100755
--- a/trace_streamer/sdk/dubai_sdk/protos/protos.gni
+++ b/trace_streamer/sdk/dubai_sdk/protos/protos.gni
@@ -11,21 +11,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../build/config.gni")
+import("../../../build/config.gni")
 
 subsys_name = OHOS_PROFILER_SUBSYS_NAME
 part_name = OHOS_PROFILER_PART_NAME
-subsys_x64_out = "clang_x64/$subsys_name/$part_name"
+
+# subsys_x64_out = "clang_x64/$subsys_name/$part_name"
 libc_dir_proto = rebase_path("$asdk_libs_dir", "//")
 root_output_dir_proto = rebase_path("$root_out_dir", "//")
 
 #host:clang_x64 default:arm mingw:mingw_x86_64
 if (current_toolchain != host_toolchain) {
   if (current_toolchain == default_toolchain) {
-    root_output_dir_proto = "$root_output_dir_proto/clang_x64"
+    root_output_dir_proto = "$root_output_dir_proto/$clang_x64_folder"
   } else {
     root_output_dir_proto =
-        get_path_info("$root_output_dir_proto", "dir") + "/clang_x64"
+        get_path_info("$root_output_dir_proto", "dir") + "/$clang_x64_folder"
   }
 }
 protoc = root_output_dir_proto
diff --git a/trace_streamer/sdk/dubai_sdk/protos/types/plugins/mock_data/BUILD.gn b/trace_streamer/sdk/dubai_sdk/protos/types/plugins/mock_data/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..d06e80472cc3ffa9d4ee55706cf1c1bce68ae52b
--- /dev/null
+++ b/trace_streamer/sdk/dubai_sdk/protos/types/plugins/mock_data/BUILD.gn
@@ -0,0 +1,123 @@
+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+import("../../../protos.gni")
+
+mock_data_sources = [
+  "./mock_plugin_config.proto",
+  "./mock_plugin_result.proto",
+]
+
+#######################################################
+proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
+proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
+
+mock_data_codegen = []
+mock_data_codegen_standard = []
+mock_data_codegen_reader = []
+mock_data_codegen_all = []
+foreach(proto, mock_data_sources) {
+  name = get_path_info(proto, "name")
+  mock_data_codegen += [
+    "$proto_out_dir/$name.pb.h",
+    "$proto_out_dir/$name.pb.cc",
+  ]
+  mock_data_codegen_standard += [
+    "$proto_out_dir/${name}_standard.pb.h",
+    "$proto_out_dir/${name}_standard.pb.cc",
+  ]
+  mock_data_codegen_reader += [ "$proto_out_dir/$name.pbreader.h" ]
+}
+mock_data_codegen_all += mock_data_codegen
+mock_data_codegen_all += mock_data_codegen_standard
+mock_data_codegen_all += mock_data_codegen_reader
+
+mock_plugin_config_sources = [ "./mock_plugin_config.proto" ]
+mock_plugin_config_codegen_standard = []
+foreach(proto, mock_plugin_config_sources) {
+  name = get_path_info(proto, "name")
+  mock_plugin_config_codegen_standard += [
+    "$proto_out_dir/${name}_standard.pb.h",
+    "$proto_out_dir/${name}_standard.pb.cc",
+  ]
+}
+
+config("cpu_include_config") {
+  include_dirs = [ "$proto_out_dir" ]
+}
+
+#######################################################
+action("mock_data_cpp_gen") {
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
+  sources = mock_data_sources
+  outputs = mock_data_codegen_all
+  args = [
+    "$libc_dir_proto",
+    "$root_output_dir_proto",
+    "$proto_rel_out_dir",  # standard proto file destination path
+    "--cpp_out",
+    "$proto_rel_out_dir",
+    "--proto_path",
+    rebase_path(".", root_build_dir),
+  ]
+  args += rebase_path(sources, root_build_dir)
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
+}
+
+ohos_source_set("mock_data_cpp") {
+  deps = [ ":mock_data_cpp_gen" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":cpu_include_config" ]
+  sources = mock_data_codegen
+}
+
+ohos_source_set("mock_data_cpp_standard") {
+  deps = [ ":mock_data_cpp_gen" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":cpu_include_config" ]
+  sources = mock_data_codegen_standard
+}
+
+ohos_source_set("mock_plugin_config_cpp_standard") {
+  deps = [ ":mock_data_cpp_gen" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":cpu_include_config" ]
+  sources = mock_plugin_config_codegen_standard
+  subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
+  part_name = "${OHOS_PROFILER_PART_NAME}"
+}
+
+ohos_source_set("mock_data_encoder") {
+  deps = [ ":mock_data_cpp_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":cpu_include_config" ]
+  sources = mock_data_codegen_reader
+}
diff --git a/trace_streamer/sdk/dubai_sdk/protos/types/plugins/mock_data/mock_plugin_config.proto b/trace_streamer/sdk/dubai_sdk/protos/types/plugins/mock_data/mock_plugin_config.proto
index fbe13025e00db2ec32b59aa30dc15f088ac922a4..3c2260ffa20d93298f72feb09b8ffe9ce37d052e 100755
--- a/trace_streamer/sdk/dubai_sdk/protos/types/plugins/mock_data/mock_plugin_config.proto
+++ b/trace_streamer/sdk/dubai_sdk/protos/types/plugins/mock_data/mock_plugin_config.proto
@@ -18,5 +18,5 @@ message MockConfig {
     uint32 version = 1;
 	string counters = 2;
 	bool stop_gator = 3;
-	uint32 duration = 1;
+	uint32 duration = 4;
 }
diff --git a/trace_streamer/src/BUILD.gn b/trace_streamer/src/BUILD.gn
index bcf90934e8d1853f47387cc0c153e0a0943072c9..f589630fec4ed0de12e8e37dfba26cdd4dedc86d 100644
--- a/trace_streamer/src/BUILD.gn
+++ b/trace_streamer/src/BUILD.gn
@@ -49,18 +49,6 @@ ohos_source_set("lib") {
     "proto_reader/include",
     "${THIRD_PARTY}/sqlite/include",
     "${THIRD_PARTY}/json-master/single_include/nlohmann",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
-    "${OHOS_PROTO_GEN}/types/plugins/ftrace_data/${kernel_version}",
-    "${OHOS_PROTO_GEN}/types/plugins/hilog_data",
-    "${OHOS_PROTO_GEN}/types/plugins/native_hook",
-    "${OHOS_PROTO_GEN}/types/plugins/hidump_data",
-    "${OHOS_PROTO_GEN}/types/plugins/network_data",
-    "${OHOS_PROTO_GEN}/types/plugins/cpu_data",
-    "${OHOS_PROTO_GEN}/types/plugins/diskio_data",
-    "${OHOS_PROTO_GEN}/types/plugins/process_data",
-    "${OHOS_PROTO_GEN}/types/plugins/hisysevent_data",
-    "${OHOS_PROTO_GEN}/types/plugins/js_memory",
-    "${OHOS_PROTO_GEN}",
     "${THIRD_PARTY}/protobuf/src",
     "${THIRD_PARTY}/hiperf/include",
   ]
@@ -81,6 +69,12 @@ ohos_source_set("lib") {
     ]
   }
   public_deps = []
+  if (!use_wasm && !is_test && !is_fuzz) {
+    public_deps += [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
 }
 ohos_source_set("trace_streamer_source") {
   subsystem_name = "trace_streamer"
@@ -112,18 +106,6 @@ ohos_source_set("trace_streamer_source") {
     "proto_reader/include",
     "parser/ebpf_parser",
     "${THIRD_PARTY}/sqlite/include",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
-    "${OHOS_PROTO_GEN}/types/plugins/ftrace_data/${kernel_version}",
-    "${OHOS_PROTO_GEN}/types/plugins/hilog_data",
-    "${OHOS_PROTO_GEN}/types/plugins/native_hook",
-    "${OHOS_PROTO_GEN}/types/plugins/hidump_data",
-    "${OHOS_PROTO_GEN}/types/plugins/network_data",
-    "${OHOS_PROTO_GEN}/types/plugins/cpu_data",
-    "${OHOS_PROTO_GEN}/types/plugins/diskio_data",
-    "${OHOS_PROTO_GEN}/types/plugins/process_data",
-    "${OHOS_PROTO_GEN}/types/plugins/hisysevent_data",
-    "${OHOS_PROTO_GEN}/types/plugins/js_memory",
-    "${OHOS_PROTO_GEN}",
     "${THIRD_PARTY}/protobuf/src",
   ]
   if (use_wasm) {
@@ -159,11 +141,19 @@ ohos_source_set("trace_streamer_source") {
       "${THIRD_PARTY}/perf_include/musl",
     ]
   }
+  public_deps = [
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/services:all_type_cpp_standard",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/cpu_data:cpu_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/ftrace_data/${device_kernel_version}:ftrace_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/hilog_data:hilog_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/hisysevent_data:hisysevent_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/memory_data:memory_data_encoder",
+  ]
+
   deps = [
     "${THIRD_PARTY}/sqlite:sqlite",
     "base:base",
     "filter:filter",
-    "include:ibase",
     "parser:parser",
     "table:table",
     "trace_data:trace_data",
@@ -194,7 +184,6 @@ ohos_source_set("trace_streamer_source") {
       cflags += [ "-D IS_UT" ]
     }
   }
-  public_deps = []
 }
 if (use_wasm) {
   wasm_lib("trace_streamer_builtin_wasm") {
diff --git a/trace_streamer/src/base/BUILD.gn b/trace_streamer/src/base/BUILD.gn
index d314a6bfa1a66ffc3f8ffa7927e203145bfb9839..547d2d8837df76d1bef8c4dd3c287e72cc86ca08 100644
--- a/trace_streamer/src/base/BUILD.gn
+++ b/trace_streamer/src/base/BUILD.gn
@@ -17,14 +17,11 @@ ohos_source_set("base") {
   subsystem_name = "trace_streamer"
   part_name = "trace_streamer_source_base"
   deps = [
+    ":base_parser",
+    ":base_table",
     ":ibase",
-    ":parser",
-    ":table",
-  ]
-  public_deps = [
-    "../include:ibase",
-    "sqlite_ext:sqliteext",
   ]
+  public_deps = [ "sqlite_ext:sqliteext" ]
   include_dirs = [ "../include" ]
   sources = [
     "clock_filter.cpp",
@@ -46,6 +43,11 @@ ohos_source_set("base") {
     ]
   }
 }
+ohos_source_set("string_help") {
+  subsystem_name = "trace_streamer"
+  part_name = "string_help"
+  sources = [ "string_help.cpp" ]
+}
 ohos_source_set("ibase") {
   subsystem_name = "trace_streamer"
   part_name = "ibase"
@@ -62,7 +64,7 @@ ohos_source_set("ibase") {
   deps = []
   sources += [ "/usr/x86_64-w64-mingw32/include/windows.h" ]
 }
-ohos_source_set("parser") {
+ohos_source_set("base_parser") {
   subsystem_name = "trace_streamer"
   part_name = "parser"
   sources = [
@@ -73,7 +75,7 @@ ohos_source_set("parser") {
   public_deps = []
   deps = []
 }
-ohos_source_set("table") {
+ohos_source_set("base_table") {
   subsystem_name = "trace_streamer"
   part_name = "table"
   sources = [
diff --git a/trace_streamer/src/base/index_map.cpp b/trace_streamer/src/base/index_map.cpp
index 5d6adb719e46bfb742a2b12cd83c19a3b4e85417..ac3196882fcec26f9dbd00f596c3fc9635c346c1 100644
--- a/trace_streamer/src/base/index_map.cpp
+++ b/trace_streamer/src/base/index_map.cpp
@@ -152,17 +152,16 @@ void IndexMap::FilterTS(unsigned char op, sqlite3_value* argv, const std::deque<
         }
         case SQLITE_INDEX_CONSTRAINT_LE:
             v++;
-        case SQLITE_INDEX_CONSTRAINT_LT: {
+        case SQLITE_INDEX_CONSTRAINT_LT:
             IntersectLessEqual(times, v, getValue);
             break;
-            case SQLITE_INDEX_CONSTRAINT_ISNOTNULL: {
-                RemoveNullElements(times, v);
-                break;
-            }
-            default:
-                break;
-        } // end of switch (op)
-    }
+        case SQLITE_INDEX_CONSTRAINT_ISNOTNULL: {
+            RemoveNullElements(times, v);
+            break;
+        }
+        default:
+            break;
+    } // end of switch (op)
 }
 void IndexMap::Merge(IndexMap* other)
 {
diff --git a/trace_streamer/src/base/log.h b/trace_streamer/src/base/log.h
index dc766cbe155e38da3cd032ac6ff54e2867e147b6..6d9dbb6bf40fddf0c9e70b9755bf0966454863ac 100644
--- a/trace_streamer/src/base/log.h
+++ b/trace_streamer/src/base/log.h
@@ -17,7 +17,7 @@
 #define INCLUDE_TS_BASE_LOGGING_H_
 
 #include <iostream>
-#include <string.h>
+#include <cstring>
 
 // namespace SysTuning {
 // namespace base {
diff --git a/trace_streamer/src/base/sqlite_ext/BUILD.gn b/trace_streamer/src/base/sqlite_ext/BUILD.gn
index 4522ad96c3d7442f7d8d63b9d4b95c833add4c27..72de31faab6a43662653242f22f9ecbb95d72012 100644
--- a/trace_streamer/src/base/sqlite_ext/BUILD.gn
+++ b/trace_streamer/src/base/sqlite_ext/BUILD.gn
@@ -12,9 +12,10 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
+import("../../../build/ts.gni")
 config("sqlite_config") {
   include_dirs = [
-    "../../../third_party/sqlite/include",
+    "${THIRD_PARTY}/sqlite/include",
     "..",
   ]
   cflags = [
diff --git a/trace_streamer/src/base/string_help.cpp b/trace_streamer/src/base/string_help.cpp
index 41d2ce42c36e81aa702bbc0937aa4ed5c0373821..fbe232fc4dfd2a868a0f35fa80d2610d49dbdb24 100644
--- a/trace_streamer/src/base/string_help.cpp
+++ b/trace_streamer/src/base/string_help.cpp
@@ -45,7 +45,7 @@ int32_t sscanf_s(const char* buffer, const char* format, ...)
 
 int32_t strncpy_s(char* strDest, size_t destMax, const char* strSrc, size_t count)
 {
-    (void*)strncpy(strDest, strSrc, destMax);
+    (void)strncpy(strDest, strSrc, destMax);
     return destMax;
 }
 #endif
@@ -123,10 +123,10 @@ bool EndWith(const std::string& str, const std::string& res)
 std::vector<std::string> SplitStringToVec(const std::string& str, const std::string& pat)
 {
     std::vector<std::string> result;
-    int32_t curPos = 0;
-    int32_t patPos = 0;
-    int32_t strSize = str.size();
-    int32_t patSize = pat.size();
+    size_t curPos = 0;
+    size_t patPos = 0;
+    size_t strSize = str.size();
+    size_t patSize = pat.size();
     while (curPos < strSize) {
         patPos = str.find(pat, curPos);
         if (patPos == std::string::npos) {
diff --git a/trace_streamer/src/base/string_to_numerical.h b/trace_streamer/src/base/string_to_numerical.h
index 8023f20a13b8344ed5f2547850557c880766b0f4..020f72c7b71101074e0157d32f5444f5e293701b 100644
--- a/trace_streamer/src/base/string_to_numerical.h
+++ b/trace_streamer/src/base/string_to_numerical.h
@@ -21,7 +21,7 @@
 #include <sstream>
 #include <string>
 #include <typeinfo>
-
+#include "log.h"
 namespace SysTuning {
 namespace base {
 enum IntegerRadixType { INTEGER_RADIX_TYPE_DEC = 10, INTEGER_RADIX_TYPE_HEX = 16 };
diff --git a/trace_streamer/src/cfg/trace_streamer_config.cpp b/trace_streamer/src/cfg/trace_streamer_config.cpp
index b1ba9bba4bd861f6c830d1003d47312dddb01b34..2de65d1171ab360b4420b5bbad843c09fe41543a 100644
--- a/trace_streamer/src/cfg/trace_streamer_config.cpp
+++ b/trace_streamer/src/cfg/trace_streamer_config.cpp
@@ -14,9 +14,12 @@
  */
 
 #include "trace_streamer_config.h"
+#include "memory_plugin_common.pbreader.h"
+#include "memory_plugin_result.pbreader.h"
 #include "log.h"
 namespace SysTuning {
 namespace TraceCfg {
+using namespace ProtoReader;
 TraceStreamerConfig::TraceStreamerConfig()
 {
     InitEventNameMap();
diff --git a/trace_streamer/src/cfg/trace_streamer_config.h b/trace_streamer/src/cfg/trace_streamer_config.h
index 92569bbeb3b1bbb447e63bae56359547b18495e4..c81cfc35df50b9c7509a54553c97d7261e8ce48e 100644
--- a/trace_streamer/src/cfg/trace_streamer_config.h
+++ b/trace_streamer/src/cfg/trace_streamer_config.h
@@ -17,7 +17,6 @@
 #define TRACE_STREAMER_CONFIG_H
 #include <map>
 #include <string>
-#include "memory_plugin_common.pb.h"
 #include "ts_common.h"
 namespace SysTuning {
 namespace TraceCfg {
@@ -181,9 +180,9 @@ public:
     // process mem info desc
     std::map<MemInfoType, std::string> memNameMap_ = {};
     // sys memorty info desc
-    std::map<SysMeminfoType, std::string> sysMemNameMap_ = {};
+    std::map<uint32_t, std::string> sysMemNameMap_ = {};
     // sys virtual memorty info desc
-    std::map<SysVMeminfoType, std::string> sysVirtualMemNameMap_ = {};
+    std::map<uint32_t, std::string> sysVirtualMemNameMap_ = {};
 
 private:
     void InitEventNameMap();
diff --git a/trace_streamer/src/filter/BUILD.gn b/trace_streamer/src/filter/BUILD.gn
index 39830ce17baca481d52265b536a3b02eb2ba262b..6162f0f921647582906abc3ccfdf59cb4cd04e5a 100644
--- a/trace_streamer/src/filter/BUILD.gn
+++ b/trace_streamer/src/filter/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../build/ohos.gni")
+import("//build/ohos.gni")
 import("../../build/ts.gni")
 
 ohos_source_set("filter") {
@@ -66,6 +66,7 @@ ohos_source_set("filter") {
       cflags += [ "-D IS_UT" ]
     }
   }
+  public_deps = [ "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/native_hook:native_hook_data_encoder" ]
   deps = []
   include_dirs = [
     "${SRC}/base",
@@ -74,8 +75,6 @@ ohos_source_set("filter") {
     "${SRC}/include",
     "${SRC}/filter",
     "${SRC}/cfg",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
-    "${OHOS_PROTO_GEN}/types/plugins/native_hook",
     "${SRC}",
     "${THIRD_PARTY}/protobuf/src",
     "${THIRD_PARTY}/sqlite/include",
diff --git a/trace_streamer/src/filter/frame_filter.cpp b/trace_streamer/src/filter/frame_filter.cpp
index 237f147b8be587ec4c48af545cf271d8bc046c62..4a0f6f7bacff1a4a131d71ccfa25c0eae9367c58 100644
--- a/trace_streamer/src/filter/frame_filter.cpp
+++ b/trace_streamer/src/filter/frame_filter.cpp
@@ -41,7 +41,7 @@ void FrameFilter::BeginVsyncEvent(uint64_t ts,
     frame->frameSliceRow_ =
         traceDataCache_->GetFrameSliceData()->AppendFrame(ts, ipid, itid, vsyncId, callStackSliceId);
     frame->frameExpectedSliceRow_ = traceDataCache_->GetFrameSliceData()->AppendFrame(
-        expectStart, ipid, itid, vsyncId, callStackSliceId, expectEnd, (uint8_t)EXPECT_SLICE);
+        expectStart, ipid, itid, vsyncId, callStackSliceId, expectEnd, (uint8_t)TraceStdtype::FrameSlice::EXPECT_SLICE);
     if (vsyncRenderSlice_.count(itid)) {
         vsyncRenderSlice_[itid].push_back(frame);
     } else {
@@ -62,11 +62,8 @@ bool FrameFilter::MarkRSOnvsyncEvent(uint64_t ts, uint32_t itid)
         TS_LOGW("BeginOnvsyncEvent find for itid:%u failed", itid);
         return false;
     }
-    auto pos = frame->second.begin();
-    if (frame->second.size() > 1) {
-        pos++;
-    }
-    pos->get()->isRsMainThread_ = true;
+    auto lastFrameSlice = frame->second.back();
+    lastFrameSlice->isRsMainThread_ = true;
     return true;
 }
 bool FrameFilter::EndOnVsyncEvent(uint64_t ts, uint32_t itid)
@@ -80,15 +77,12 @@ bool FrameFilter::EndOnVsyncEvent(uint64_t ts, uint32_t itid)
         TS_LOGW("BeginOnvsyncEvent find for itid:%u failed", itid);
         return false;
     }
-    auto pos = frame->second.begin();
-    if (frame->second.size() > 1) {
-        pos++;
-    }
-    if (!pos->get()->isRsMainThread_ && ISINVALIDU32(pos->get()->frameNum_)) {
+    auto lastFrameSlice = frame->second.back();
+    if (!lastFrameSlice->isRsMainThread_ && ISINVALIDU32(lastFrameSlice->frameNum_)) {
         // if app's frame num not received
-        traceDataCache_->GetFrameSliceData()->Erase(pos->get()->frameSliceRow_);
-        traceDataCache_->GetFrameSliceData()->Erase(pos->get()->frameExpectedSliceRow_);
-        frame->second.erase(pos);
+        traceDataCache_->GetFrameSliceData()->Erase(lastFrameSlice->frameSliceRow_);
+        traceDataCache_->GetFrameSliceData()->Erase(lastFrameSlice->frameExpectedSliceRow_);
+        frame->second.pop_back();
         return false;
     }
     return true;
@@ -129,11 +123,10 @@ bool FrameFilter::BeginProcessCommandUni(uint64_t ts,
         TS_LOGW("BeginProcessCommandUni find for itid:%u failed", itid);
         return false;
     }
-    auto pos = frame->second.begin();
-    if (frame->second.size() > 1) {
-        if (frame->second.begin()->get()->vsyncEnd_) {
-            pos++;
-        }
+    auto lastFrameSlice = frame->second.back();
+    if (lastFrameSlice->vsyncEnd_) {
+        TS_LOGW("BeginProcessCommandUni finished for vsyncId:%u", lastFrameSlice->vsyncId_);
+        return false;
     }
     std::vector<uint64_t> fromSlices = {};
     std::vector<uint64_t> fromExpectedSlices = {};
@@ -152,16 +145,16 @@ bool FrameFilter::BeginProcessCommandUni(uint64_t ts,
         }
         fromSlices.push_back(srcFrame->second.get()->frameSliceRow_);
         fromExpectedSlices.push_back(srcFrame->second.get()->frameExpectedSliceRow_);
-        srcFrame->second.get()->dstFrameSliceId_ = pos->get()->frameSliceRow_;
-        srcFrame->second.get()->dstExpectedFrameSliceId_ = pos->get()->frameExpectedSliceRow_;
-        (void)traceDataCache_->GetFrameMapsData()->AppendNew(srcFrame->second.get()->frameSliceRow_,
+        srcFrame->second.get()->dstFrameSliceId_ = lastFrameSlice->frameSliceRow_;
+        srcFrame->second.get()->dstExpectedFrameSliceId_ = lastFrameSlice->frameExpectedSliceRow_;
+        TraceStdtype::FrameSlice* frameSlice = traceDataCache_->GetFrameSliceData();
+        (void)traceDataCache_->GetFrameMapsData()->AppendNew(frameSlice, srcFrame->second.get()->frameSliceRow_,
                                                              srcFrame->second.get()->dstFrameSliceId_);
-        (void)traceDataCache_->GetFrameMapsData()->AppendNew(srcFrame->second.get()->frameExpectedSliceRow_,
+        (void)traceDataCache_->GetFrameMapsData()->AppendNew(frameSlice, srcFrame->second.get()->frameExpectedSliceRow_,
                                                              srcFrame->second.get()->dstExpectedFrameSliceId_);
-        traceDataCache_->GetFrameSliceData()->SetDst(srcFrame->second.get()->frameSliceRow_,
-                                                     srcFrame->second.get()->dstFrameSliceId_);
-        traceDataCache_->GetFrameSliceData()->SetDst(srcFrame->second.get()->frameExpectedSliceRow_,
-                                                     srcFrame->second.get()->dstExpectedFrameSliceId_);
+        frameSlice->SetDst(srcFrame->second.get()->frameSliceRow_, srcFrame->second.get()->dstFrameSliceId_);
+        frameSlice->SetDst(srcFrame->second.get()->frameExpectedSliceRow_,
+                           srcFrame->second.get()->dstExpectedFrameSliceId_);
         if (srcFrame->second.get()->endTs_ != INVALID_UINT64) {
             // erase Source
             sourceFrameMap->second.erase(it.frameNum);
@@ -170,10 +163,10 @@ bool FrameFilter::BeginProcessCommandUni(uint64_t ts,
     if (!fromSlices.size()) {
         return false;
     }
-    pos->get()->sourceSlice_ = fromSlices;
-    pos->get()->sourceExpectedSlice_ = fromExpectedSlices;
-    traceDataCache_->GetFrameSliceData()->SetSrcs(pos->get()->frameSliceRow_, fromSlices);
-    traceDataCache_->GetFrameSliceData()->SetSrcs(pos->get()->frameExpectedSliceRow_, fromExpectedSlices);
+    lastFrameSlice->sourceSlice_ = fromSlices;
+    lastFrameSlice->sourceExpectedSlice_ = fromExpectedSlices;
+    traceDataCache_->GetFrameSliceData()->SetSrcs(lastFrameSlice->frameSliceRow_, fromSlices);
+    traceDataCache_->GetFrameSliceData()->SetSrcs(lastFrameSlice->frameExpectedSliceRow_, fromExpectedSlices);
     return true;
 }
 bool FrameFilter::EndVsyncEvent(uint64_t ts, uint32_t itid)
@@ -187,31 +180,28 @@ bool FrameFilter::EndVsyncEvent(uint64_t ts, uint32_t itid)
         TS_LOGW("EndVsyncEvent find for itid:%u ts:%llu failed", itid, ts);
         return false;
     }
-    auto pos = frame->second.begin();
-    if (frame->second.size() > 1) {
-        pos++;
-    }
-    pos->get()->vsyncEnd_ = true;
-    if (pos->get()->isRsMainThread_) {
-        if (pos->get()->gpuEnd_) {
+    auto lastFrameSlice = frame->second.back();
+    lastFrameSlice->vsyncEnd_ = true;
+    if (lastFrameSlice->isRsMainThread_) {
+        if (lastFrameSlice->gpuEnd_) {
             traceDataCache_->GetFrameSliceData()->SetEndTimeAndFlag(
-                pos->get()->frameSliceRow_, ts, pos->get()->expectedDur_, pos->get()->expectedEndTs_);
-            pos->get()->endTs_ = ts;
+                lastFrameSlice->frameSliceRow_, ts, lastFrameSlice->expectedDur_, lastFrameSlice->expectedEndTs_);
+            lastFrameSlice->endTs_ = ts;
             // for Render serivce
-            frame->second.erase(pos);
+            frame->second.pop_back();
         }
     } else { // for app
-        traceDataCache_->GetFrameSliceData()->SetEndTimeAndFlag(pos->get()->frameSliceRow_, ts,
-                                                                pos->get()->expectedDur_, pos->get()->expectedEndTs_);
-        if (ISINVALIDU32(pos->get()->frameNum_)) {
+        traceDataCache_->GetFrameSliceData()->SetEndTimeAndFlag(
+            lastFrameSlice->frameSliceRow_, ts, lastFrameSlice->expectedDur_, lastFrameSlice->expectedEndTs_);
+        if (ISINVALIDU32(lastFrameSlice->frameNum_)) {
             // if app's frame num not received
-            traceDataCache_->GetFrameSliceData()->Erase(pos->get()->frameSliceRow_);
-            traceDataCache_->GetFrameSliceData()->Erase(pos->get()->frameExpectedSliceRow_);
-            frame->second.erase(pos);
+            traceDataCache_->GetFrameSliceData()->Erase(lastFrameSlice->frameSliceRow_);
+            traceDataCache_->GetFrameSliceData()->Erase(lastFrameSlice->frameExpectedSliceRow_);
+            frame->second.pop_back();
             return false;
         }
-        pos->get()->endTs_ = ts;
-        frame->second.erase(pos);
+        lastFrameSlice->endTs_ = ts;
+        frame->second.pop_back();
     }
     return true;
 }
@@ -227,9 +217,9 @@ bool FrameFilter::StartFrameQueue(uint64_t ts, uint32_t itid)
         TS_LOGW("StartFrameQueue find for itid:%u failed", itid);
         return false;
     }
-    auto pos = frame->second.begin();
-    pos->get()->gpuEnd_ = false;
-    pos->get()->frameQueueStartTs_ = ts;
+    auto firstFrameSlice = frame->second.front();
+    firstFrameSlice->gpuEnd_ = false;
+    firstFrameSlice->frameQueueStartTs_ = ts;
     return true;
 }
 bool FrameFilter::EndFrameQueue(uint64_t ts, uint32_t itid)
@@ -243,16 +233,17 @@ bool FrameFilter::EndFrameQueue(uint64_t ts, uint32_t itid)
         TS_LOGW("EndFrameQueue find for itid:%u ts:%llu  failed", itid, ts);
         return false;
     }
-    auto pos = frame->second.begin();
-    (void)traceDataCache_->GetGPUSliceData()->AppendNew(pos->get()->frameSliceRow_,
-                                                        ts - pos->get()->frameQueueStartTs_);
-    pos->get()->gpuEnd_ = true;
-    if (pos->get()->vsyncEnd_) {
-        pos->get()->endTs_ = ts;
-        traceDataCache_->GetFrameSliceData()->SetEndTimeAndFlag(pos->get()->frameSliceRow_, ts,
-                                                                pos->get()->expectedDur_, pos->get()->expectedEndTs_);
+    auto firstFrameSlicePos = frame->second.begin();
+    (void)traceDataCache_->GetGPUSliceData()->AppendNew(firstFrameSlicePos->get()->frameSliceRow_,
+                                                        ts - firstFrameSlicePos->get()->frameQueueStartTs_);
+    firstFrameSlicePos->get()->gpuEnd_ = true;
+    if (firstFrameSlicePos->get()->vsyncEnd_) {
+        firstFrameSlicePos->get()->endTs_ = ts;
+        traceDataCache_->GetFrameSliceData()->SetEndTimeAndFlag(firstFrameSlicePos->get()->frameSliceRow_, ts,
+                                                                firstFrameSlicePos->get()->expectedDur_,
+                                                                firstFrameSlicePos->get()->expectedEndTs_);
         // if vsync ended
-        frame->second.erase(pos);
+        frame->second.erase(firstFrameSlicePos);
     }
     return true;
 }
diff --git a/trace_streamer/src/filter/frame_filter.h b/trace_streamer/src/filter/frame_filter.h
index fac3d0f9dca6052b0bc66d73ef5ff2a210f6fdcd..71c5b2d47bd5431e743e2f8c53d58b9ed5525fca 100644
--- a/trace_streamer/src/filter/frame_filter.h
+++ b/trace_streamer/src/filter/frame_filter.h
@@ -47,7 +47,6 @@ public:
     void Finish();
 
 private:
-    typedef enum FrameSliceType { ACTURAL_SLICE, EXPECT_SLICE } FrameSliceType;
     class FrameSlice {
     public:
         FrameSlice() {}
@@ -61,7 +60,7 @@ private:
         uint64_t expectedDur_ = INVALID_UINT64;
         uint64_t endTs_ = INVALID_UINT64;
         bool gpuEnd_ = true;
-        FrameSliceType frameType_ = ACTURAL_SLICE;
+        TraceStdtype::FrameSlice::FrameSliceType frameType_ = TraceStdtype::FrameSlice::ACTURAL_SLICE;
         uint32_t vsyncId_ = INVALID_UINT32;
         uint64_t frameQueueStartTs_ = INVALID_UINT64;
         bool vsyncEnd_ = false;
diff --git a/trace_streamer/src/filter/native_hook_filter.cpp b/trace_streamer/src/filter/native_hook_filter.cpp
index 4b745af8db437675dac8630569b86f2ede5656d3..0f660864a4b7387e489ba5efe0e88beb38f268d2 100644
--- a/trace_streamer/src/filter/native_hook_filter.cpp
+++ b/trace_streamer/src/filter/native_hook_filter.cpp
@@ -14,6 +14,7 @@
  */
 
 #include "native_hook_filter.h"
+#include "native_hook_config.pbreader.h"
 namespace SysTuning {
 namespace TraceStreamer {
 NativeHookFilter::NativeHookFilter(TraceDataCache* dataCache, const TraceStreamerFilters* filter)
@@ -39,7 +40,7 @@ void NativeHookFilter::ParseConfigInfo(ProtoReader::BytesView& protoData)
         isStringCompressedMode_ = true;
         return;
     }
-    if (configReader.has_callframe_compressed()) {
+    if (configReader.has_callframe_compress()) {
         isCallStackCompressedMode_ = true;
         isStringCompressedMode_ = true;
         return;
diff --git a/trace_streamer/src/filter/native_hook_filter.h b/trace_streamer/src/filter/native_hook_filter.h
index c7d5d6d83ef87b54be99cc6579a034a118fdb847..e07fc8500b08b63413a508c5cbaad8f3a59835a5 100644
--- a/trace_streamer/src/filter/native_hook_filter.h
+++ b/trace_streamer/src/filter/native_hook_filter.h
@@ -14,7 +14,7 @@
  */
 #ifndef NATIVE_HOOK_FILTER_H
 #define NATIVE_HOOK_FILTER_H
-#include "native_hook_config.pbreader.h"
+#include <set>
 #include "numerical_to_string.h"
 #include "offline_symbolization_filter.h"
 #include "stat_filter.h"
diff --git a/trace_streamer/src/filter/slice_filter.cpp b/trace_streamer/src/filter/slice_filter.cpp
index 3acfe3e5eedc7ce8b480fab57a907f1d69dd4fca..6d8859648d10df5f9c396b898c1b82b080f6b696 100644
--- a/trace_streamer/src/filter/slice_filter.cpp
+++ b/trace_streamer/src/filter/slice_filter.cpp
@@ -297,7 +297,7 @@ size_t SliceFilter::StartSlice(uint64_t timeStamp,
                                ArgsSet& args,
                                SliceData sliceData)
 {
-    InternalTid internalTid = streamFilters_->processFilter_->UpdateOrCreateThread(timeStamp, pid);
+    InternalTid internalTid = sliceData.internalTid;
     auto& sliceStack = binderStackMap_[internalTid];
     auto& stack = sliceStack.sliceStack;
     if (sliceStack.isAsyncEvent) {
@@ -312,9 +312,9 @@ size_t SliceFilter::StartSlice(uint64_t timeStamp,
     uint32_t depth = stack.size();
     auto slices = traceDataCache_->GetInternalSlicesData();
     uint32_t parentId = depth == 0 ? INVALID_UINT32 : slices->IdsData()[stack.back().index];
-    size_t index = slices->AppendInternalSlice(
-        sliceData.timeStamp, sliceData.duration, sliceData.internalTid, sliceData.cat,
-        GetNameASCIISumNoNum(traceDataCache_->GetDataFromDict(sliceData.name)), sliceData.name, 0, parentId);
+    size_t index = slices->AppendInternalSlice(sliceData.timeStamp, sliceData.duration, internalTid, sliceData.cat,
+                                               GetNameASCIISumNoNum(traceDataCache_->GetDataFromDict(sliceData.name)),
+                                               sliceData.name, 0, parentId);
     if (depth >= std::numeric_limits<uint8_t>::max()) {
         return SIZE_MAX;
     }
@@ -335,7 +335,7 @@ size_t SliceFilter::StartSlice(uint64_t timeStamp,
         slices->SetArgSetId(index, argSetId);
     }
     sliceData.argSetId = argSetId;
-    RememberSliceData(sliceData.internalTid, binderStackMap_, sliceData, depth, index);
+    RememberSliceData(internalTid, binderStackMap_, sliceData, depth, index);
     return index;
 }
 size_t SliceFilter::BeginBinder(uint64_t timeStamp, uint32_t pid, DataIndex cat, DataIndex nameIndex, ArgsSet args)
@@ -345,9 +345,19 @@ size_t SliceFilter::BeginBinder(uint64_t timeStamp, uint32_t pid, DataIndex cat,
     return StartSlice(timeStamp, pid, cat, nameIndex, args, std::move(sliceData));
 }
 
-size_t SliceFilter::CompleteSlice(uint64_t timeStamp, uint32_t pid, DataIndex category, DataIndex name, ArgsSet args)
+size_t SliceFilter::CompleteSlice(uint64_t timeStamp,
+                                  uint32_t pid,
+                                  uint32_t threadGroupId,
+                                  DataIndex category,
+                                  DataIndex name,
+                                  ArgsSet args)
 {
-    InternalTid internalTid = streamFilters_->processFilter_->UpdateOrCreateThread(timeStamp, pid);
+    InternalTid internalTid = INVALID_ITID;
+    if (threadGroupId > 0) {
+        internalTid = streamFilters_->processFilter_->GetOrCreateThreadWithPid(pid, threadGroupId);
+    } else {
+        internalTid = streamFilters_->processFilter_->UpdateOrCreateThread(timeStamp, pid);
+    }
     if (binderStackMap_.find(internalTid) == binderStackMap_.end()) {
         return SIZE_MAX;
     }
@@ -400,7 +410,7 @@ size_t SliceFilter::CompleteSlice(uint64_t timeStamp, uint32_t pid, DataIndex ca
 }
 size_t SliceFilter::EndBinder(uint64_t timeStamp, uint32_t pid, DataIndex category, DataIndex name, ArgsSet args)
 {
-    return CompleteSlice(timeStamp, pid, category, name, args);
+    return CompleteSlice(timeStamp, pid, 0, category, name, args);
 }
 std::tuple<uint64_t, uint32_t> SliceFilter::AddArgs(uint32_t tid, DataIndex key1, DataIndex key2, ArgsSet& args)
 {
@@ -483,7 +493,7 @@ uint64_t SliceFilter::FinishAsyncSlice(uint64_t timeStamp,
 size_t
     SliceFilter::EndSlice(uint64_t timeStamp, uint32_t pid, uint32_t threadGroupId, DataIndex category, DataIndex name)
 {
-    return CompleteSlice(timeStamp, pid, category, name);
+    return CompleteSlice(timeStamp, pid, threadGroupId, category, name);
 }
 
 void SliceFilter::Clear()
diff --git a/trace_streamer/src/filter/slice_filter.h b/trace_streamer/src/filter/slice_filter.h
index d72c8a8f9e59fc75b564dcfc4360024a59072ea9..2ea1ae12a61e0243b9980cc78070a4ed264ea11d 100644
--- a/trace_streamer/src/filter/slice_filter.h
+++ b/trace_streamer/src/filter/slice_filter.h
@@ -67,6 +67,7 @@ public:
                      ArgsSet args = {});
     size_t CompleteSlice(uint64_t timeStamp,
                          uint32_t pid,
+                         uint32_t threadGroupId,
                          DataIndex category = INVALID_UINT64,
                          DataIndex name = INVALID_UINT64,
                          ArgsSet args = {});
diff --git a/trace_streamer/src/main.cpp b/trace_streamer/src/main.cpp
index 18204e7f1d3d4b58a0137e96f0b3077f40c73857..eff838d3595c732f54fc3957972a9fec7fa673e2 100644
--- a/trace_streamer/src/main.cpp
+++ b/trace_streamer/src/main.cpp
@@ -34,7 +34,7 @@
 #include "rpc_server.h"
 #include "string_help.h"
 
-#include "thread_state.h"
+#include "thread_state_flag.h"
 #include "trace_streamer/trace_streamer_selector.h"
 #include "trace_streamer_filters.h"
 #include "version.h"
diff --git a/trace_streamer/src/parser/BUILD.gn b/trace_streamer/src/parser/BUILD.gn
index 13032d7e743485b269b7aeef25bfdf3f42de056a..3efd2247e1f4ac8b2c8a0222005cc78d936724bd 100644
--- a/trace_streamer/src/parser/BUILD.gn
+++ b/trace_streamer/src/parser/BUILD.gn
@@ -27,27 +27,26 @@ ohos_source_set("parser") {
     "event_parser_base.h",
     "print_event_parser.cpp",
     "print_event_parser.h",
-    "thread_state.cpp",
-    "thread_state.h",
+    "thread_state_flag.cpp",
+    "thread_state_flag.h",
+  ]
+  deps = [
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/cpu_data:cpu_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/diskio_data:diskio_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/hidump_data:hidump_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/hilog_data:hilog_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/hisysevent_data:hisysevent_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/js_memory:js_memory_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/memory_data:memory_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/native_hook:native_hook_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/network_data:network_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/process_data:process_data_encoder",
+    "ebpf_parser:ebpf_parser",
   ]
-  deps = [ "ebpf_parser:ebpf_parser" ]
   deps += [ "htrace_pbreader_parser:htrace_pbreader_parser" ]
 
   include_dirs = [
     "${THIRD_PARTY}/protobuf/src",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
-    "${OHOS_PROTO_GEN}/types/plugins/ftrace_data/${kernel_version}",
-    "${OHOS_PROTO_GEN}/types/plugins/hilog_data",
-    "${OHOS_PROTO_GEN}/types/plugins/native_hook",
-    "${OHOS_PROTO_GEN}/types/plugins/hidump_data",
-    "${OHOS_PROTO_GEN}/types/plugins/network_data",
-    "${OHOS_PROTO_GEN}/types/plugins/cpu_data",
-    "${OHOS_PROTO_GEN}/types/plugins/diskio_data",
-    "${OHOS_PROTO_GEN}/types/plugins/hisysevent_data",
-    "${OHOS_PROTO_GEN}/types/plugins/process_data",
-    "${OHOS_PROTO_GEN}/types/plugins/js_memory",
-    "${OHOS_PROTO_GEN}/types/plugins/",
-    "${OHOS_PROTO_GEN}",
     "${THIRD_PARTY}/sqlite/include",
     "${SRC}/base",
     "${SRC}/cfg",
diff --git a/trace_streamer/src/parser/bytrace_parser/bytrace_event_parser.cpp b/trace_streamer/src/parser/bytrace_parser/bytrace_event_parser.cpp
index efaafbe17331ecd5449e2ec24625b9aa8e5861f7..d5e3f18044345ef909a223650d4ec39a8f2a27cc 100644
--- a/trace_streamer/src/parser/bytrace_parser/bytrace_event_parser.cpp
+++ b/trace_streamer/src/parser/bytrace_parser/bytrace_event_parser.cpp
@@ -24,7 +24,7 @@
 #include "slice_filter.h"
 #include "stat_filter.h"
 #include "string_to_numerical.h"
-#include "thread_state.h"
+#include "thread_state_flag.h"
 #include "ts_common.h"
 namespace SysTuning {
 namespace TraceStreamer {
@@ -142,7 +142,7 @@ bool BytraceEventParser::SchedSwitchEvent(const ArgsMap& args, const BytraceLine
         return false;
     }
     auto prevStateStr = args.at("prev_state");
-    auto threadState = ThreadState(prevStateStr.c_str());
+    auto threadState = ThreadStateFlag(prevStateStr.c_str());
     uint64_t prevState = threadState.State();
     if (!threadState.IsValid()) {
         streamFilters_->statFilter_->IncreaseStat(TRACE_EVENT_SCHED_SWITCH, STAT_EVENT_DATA_INVALID);
diff --git a/trace_streamer/src/parser/common_types.h b/trace_streamer/src/parser/common_types.h
index 10cd75d1427d9157cd2170726b7b9d84cf088685..24d752a132cc48c6adca5ea64e8564c7fa94dc9f 100644
--- a/trace_streamer/src/parser/common_types.h
+++ b/trace_streamer/src/parser/common_types.h
@@ -17,25 +17,12 @@
 #define BYTRACE_COMMON_TYPES_H
 
 #include <atomic>
+#include <functional>
+#include <memory>
 #include <string>
 #include <unordered_map>
-#include "cpu_plugin_result.pbreader.h"
-#include "diskio_plugin_result.pbreader.h"
-#include "hidump_plugin_result.pbreader.h"
-#include "hilog_plugin_result.pbreader.h"
-#include "hisysevent_plugin_config.pbreader.h"
-#include "hisysevent_plugin_result.pbreader.h"
-#include "js_heap_config.pbreader.h"
-#include "js_heap_result.pbreader.h"
-#include "memory_plugin_result.pbreader.h"
-#include "native_hook_result.pbreader.h"
-#include "network_plugin_result.pbreader.h"
-#include "process_plugin_result.pbreader.h"
 #include "proto_reader_help.h"
-#include "services/common_types.pbreader.h"
-#include "trace_plugin_result.pbreader.h"
 #include "ts_common.h"
-#include "native_hook_result.pbreader.h"
 
 namespace SysTuning {
 namespace TraceStreamer {
diff --git a/trace_streamer/src/parser/ebpf_parser/BUILD.gn b/trace_streamer/src/parser/ebpf_parser/BUILD.gn
index b9e0c6241025b9c93143c068a9956b0bcec81623..dca9df37fe98e26f429bb9810945872f4886424d 100644
--- a/trace_streamer/src/parser/ebpf_parser/BUILD.gn
+++ b/trace_streamer/src/parser/ebpf_parser/BUILD.gn
@@ -41,21 +41,10 @@ ohos_source_set("ebpf_parser_src") {
     "../../filter",
     "../../cfg",
     "../../trace_streamer",
-    "${OHOS_PROTO_GEN}",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
-    "${OHOS_PROTO_GEN}/types/plugins/ftrace_data/${kernel_version}",
-    "${OHOS_PROTO_GEN}/types/plugins/hilog_data",
-    "${OHOS_PROTO_GEN}/types/plugins/native_hook",
-    "${OHOS_PROTO_GEN}/types/plugins/hidump_data",
-    "${OHOS_PROTO_GEN}/types/plugins/network_data",
-    "${OHOS_PROTO_GEN}/types/plugins/cpu_data",
-    "${OHOS_PROTO_GEN}/types/plugins/diskio_data",
-    "${OHOS_PROTO_GEN}/types/plugins/process_data",
-    "${OHOS_PROTO_GEN}/types/plugins/hisysevent_data",
-    "${OHOS_PROTO_GEN}/types/plugins/js_memory",
     "${THIRD_PARTY}/protobuf/src",
     "${THIRD_PARTY}/sqlite/include",
   ]
+  public_deps = [ "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/memory_data:memory_data_encoder" ]
   if (is_win || is_macx) {
     include_dirs += [
       "${THIRD_PARTY}/perf_include/linux",
diff --git a/trace_streamer/src/parser/ebpf_parser/ebpf_base.h b/trace_streamer/src/parser/ebpf_parser/ebpf_base.h
index 250a6cf0dfd72646e76778ad4beb80b72580b964..d9c2af724d73c297b00f71844bf49476b25ec29a 100644
--- a/trace_streamer/src/parser/ebpf_parser/ebpf_base.h
+++ b/trace_streamer/src/parser/ebpf_parser/ebpf_base.h
@@ -15,6 +15,7 @@
 #ifndef EBPF_BASE_H
 #define EBPF_BASE_H
 #include <algorithm>
+#include <set>
 #include <string>
 #include "double_map.h"
 #include "ebpf_data_reader.h"
diff --git a/trace_streamer/src/parser/hiperf_parser/BUILD.gn b/trace_streamer/src/parser/hiperf_parser/BUILD.gn
index c83e312501e14c54d715ff4aa57b1514c3e6863e..5dd0cb264a2fbfb14714350bee9e7f114fbb8e2b 100644
--- a/trace_streamer/src/parser/hiperf_parser/BUILD.gn
+++ b/trace_streamer/src/parser/hiperf_parser/BUILD.gn
@@ -31,7 +31,6 @@ ohos_source_set("hiperf_parser_src") {
     "..",
     "../../trace_streamer",
     "${THIRD_PARTY}/sqlite/include",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
     "${THIRD_PARTY}/protobuf/src",
     "${THIRD_PARTY}/perf_include",
     "${THIRD_PARTY}/perf_include/libbpf",
@@ -57,7 +56,7 @@ ohos_source_set("hiperf_parser_src") {
 group("hiperf_parser") {
   deps = [
     ":hiperf_parser_src",
-    "${THIRD_PARTY}/hiperf:hiperf",
+    "${PERF_DIR}/hiperf:hiperf",
     "${THIRD_PARTY}/protobuf:protobuf",
     "${THIRD_PARTY}/protobuf:protobuf_lite",
   ]
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/BUILD.gn b/trace_streamer/src/parser/htrace_pbreader_parser/BUILD.gn
index 9dde6f75146bcc6c1d37c69e963abd365a958040..fd98518f365fa023727ff1a31f72fd9a470e865c 100755
--- a/trace_streamer/src/parser/htrace_pbreader_parser/BUILD.gn
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/BUILD.gn
@@ -53,18 +53,6 @@ ohos_source_set("htrace_pbreader_parser_src") {
     ".",
     "htrace_event_parser",
     "htrace_cpu_parser",
-    "${OHOS_PROTO_GEN}",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
-    "${OHOS_PROTO_GEN}/types/plugins/ftrace_data/${kernel_version}",
-    "${OHOS_PROTO_GEN}/types/plugins/hilog_data",
-    "${OHOS_PROTO_GEN}/types/plugins/native_hook",
-    "${OHOS_PROTO_GEN}/types/plugins/hidump_data",
-    "${OHOS_PROTO_GEN}/types/plugins/network_data",
-    "${OHOS_PROTO_GEN}/types/plugins/cpu_data",
-    "${OHOS_PROTO_GEN}/types/plugins/diskio_data",
-    "${OHOS_PROTO_GEN}/types/plugins/process_data",
-    "${OHOS_PROTO_GEN}/types/plugins/hisysevent_data",
-    "${OHOS_PROTO_GEN}/types/plugins/js_memory",
     "../../include",
     "../../",
     "../",
@@ -108,7 +96,20 @@ ohos_source_set("htrace_pbreader_parser_src") {
     ]
   }
   public_deps = []
-  deps = []
+  deps = [
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/services:all_type_cpp_standard",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/cpu_data:cpu_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/diskio_data:diskio_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/ftrace_data/${device_kernel_version}:ftrace_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/hidump_data:hidump_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/hilog_data:hilog_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/hisysevent_data:hisysevent_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/js_memory:js_memory_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/memory_data:memory_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/native_hook:native_hook_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/network_data:network_data_encoder",
+    "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/process_data:process_data_encoder",
+  ]
 }
 group("htrace_pbreader_parser") {
   deps = [
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_clock_detail_parser.h b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_clock_detail_parser.h
index 7222d870bb9e69dd1eaa1a5348e8f4b1c6d15279..b91ee78e8e2fcf67f09270441c484a730ae5f3ad 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_clock_detail_parser.h
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_clock_detail_parser.h
@@ -24,7 +24,6 @@
 #include "proto_reader_help.h"
 #include "htrace_file_header.h"
 #include "trace_data/trace_data_cache.h"
-#include "trace_plugin_result.pbreader.h"
 #include "trace_streamer_config.h"
 #include "trace_streamer_filters.h"
 
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_disk_io_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_disk_io_parser.cpp
index d2f52d3c53a657a591f0c04ccff92db23393aecc..104f0fe64137c872db774fc750477c8b727bf902 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_disk_io_parser.cpp
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_disk_io_parser.cpp
@@ -14,6 +14,7 @@
  */
 #include "htrace_disk_io_parser.h"
 #include "clock_filter_ex.h"
+#include "diskio_plugin_result.pbreader.h"
 #include "htrace_event_parser.h"
 #include "process_filter.h"
 #include "stat_filter.h"
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_event_parser/htrace_event_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_event_parser/htrace_event_parser.cpp
index 65f27e9c24ed9eb3f7ba3964f15a5349e4ebac72..13a44f9ef9a76443ab0ff7f27ca77b60c09b0b76 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_event_parser/htrace_event_parser.cpp
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_event_parser/htrace_event_parser.cpp
@@ -37,7 +37,7 @@
 #include "symbols_filter.h"
 #include "system_event_measure_filter.h"
 #include "task.pbreader.h"
-#include "thread_state.h"
+#include "thread_state_flag.h"
 #include "trace_plugin_result.pbreader.h"
 #include "workqueue.pbreader.h"
 namespace SysTuning {
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_hidump_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_hidump_parser.cpp
index f667ee6ab6fe1289cb7f7551100cdc8c97c3a4b1..22c9ec90774434f560a8bbfcec5f3a8378b90613 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_hidump_parser.cpp
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_hidump_parser.cpp
@@ -14,6 +14,7 @@
  */
 #include "htrace_hidump_parser.h"
 #include "clock_filter_ex.h"
+#include "hidump_plugin_result.pbreader.h"
 #include "htrace_event_parser.h"
 #include "process_filter.h"
 #include "stat_filter.h"
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_hilog_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_hilog_parser.cpp
index 64465f2ff08eac9a840429f8be05b9e71a5935a7..46774977656496b9e834c5c96a2f2c4ff29a9eb0 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_hilog_parser.cpp
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_hilog_parser.cpp
@@ -15,6 +15,7 @@
 #include "htrace_hilog_parser.h"
 #include "clock_filter_ex.h"
 #include "event_parser_base.h"
+#include "hilog_plugin_result.pbreader.h"
 #include "htrace_event_parser.h"
 #include "process_filter.h"
 #include "stat_filter.h"
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_js_memory_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_js_memory_parser.cpp
index ca6c55db28f250eb402795108a0c14526e719f26..9be2bb85db8d14969e077306d038ed10db33f817 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_js_memory_parser.cpp
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_js_memory_parser.cpp
@@ -20,6 +20,8 @@
 #include "fcntl.h"
 #include "file.h"
 #include "htrace_event_parser.h"
+#include "js_heap_config.pbreader.h"
+#include "js_heap_result.pbreader.h"
 #include "process_filter.h"
 #include "stat_filter.h"
 #include "unistd.h"
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.cpp
index 4ac4e17307562bef9d35f7aa19b74422fb8b0fb5..cc8670aa4d6b482df9574fa0ff6c13420a4bcc43 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.cpp
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.cpp
@@ -16,6 +16,9 @@
 #include "clock_filter_ex.h"
 #include "htrace_event_parser.h"
 #include "measure_filter.h"
+#include "memory_plugin_common.pbreader.h"
+#include "memory_plugin_config.pbreader.h"
+#include "memory_plugin_result.pbreader.h"
 #include "process_filter.h"
 #include "stat_filter.h"
 #include "symbols_filter.h"
@@ -30,15 +33,12 @@ HtraceMemParser::HtraceMemParser(TraceDataCache* dataCache, const TraceStreamerF
             std::make_pair(static_cast<MemInfoType>(i),
                            traceDataCache_->GetDataIndex(config_.memNameMap_.at(static_cast<MemInfoType>(i)))));
     }
-    for (auto i = 0; i < SysMeminfoType::PMEM_KERNEL_RECLAIMABLE + 1; i++) {
-        sysMemNameDictMap_.insert(
-            std::make_pair(static_cast<SysMeminfoType>(i),
-                           traceDataCache_->GetDataIndex(config_.sysMemNameMap_.at(static_cast<SysMeminfoType>(i)))));
+    for (auto i = 0; i < ProtoReader::PMEM_KERNEL_RECLAIMABLE + 1; i++) {
+        sysMemNameDictMap_.insert(std::make_pair(i, traceDataCache_->GetDataIndex(config_.sysMemNameMap_.at(i))));
     }
-    for (auto i = 0; i < SysVMeminfoType::VMEMINFO_WORKINGSET_RESTORE + 1; i++) {
-        sysVMemNameDictMap_.insert(std::make_pair(
-            static_cast<SysVMeminfoType>(i),
-            traceDataCache_->GetDataIndex(config_.sysVirtualMemNameMap_.at(static_cast<SysVMeminfoType>(i)))));
+    for (auto i = 0; i < ProtoReader::VMEMINFO_WORKINGSET_RESTORE + 1; i++) {
+        sysVMemNameDictMap_.insert(
+            std::make_pair(i, traceDataCache_->GetDataIndex(config_.sysVirtualMemNameMap_.at(i))));
     }
 }
 
@@ -127,9 +127,9 @@ void HtraceMemParser::ParseMemInfoEasy(const ProtoReader::MemoryData_Reader* tra
     }
     for (auto i = tracePacket->meminfo(); i; ++i) {
         ProtoReader::SysMeminfo_Reader sysMeminfo(i->ToBytes());
-        if (config_.sysMemNameMap_.find(SysMeminfoType(sysMeminfo.key())) != config_.sysMemNameMap_.end()) {
-            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                sysMemNameDictMap_.at(SysMeminfoType(sysMeminfo.key())), timeStamp, sysMeminfo.value());
+        if (config_.sysMemNameMap_.find(sysMeminfo.key()) != config_.sysMemNameMap_.end()) {
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(sysMemNameDictMap_.at(sysMeminfo.key()),
+                                                                             timeStamp, sysMeminfo.value());
         } else {
             streamFilters_->statFilter_->IncreaseStat(TRACE_SYS_MEMORY, STAT_EVENT_DATA_INVALID);
         }
@@ -144,10 +144,9 @@ void HtraceMemParser::ParseVMemInfoEasy(const ProtoReader::MemoryData_Reader* tr
     }
     for (auto i = tracePacket->vmeminfo(); i; ++i) {
         ProtoReader::SysVMeminfo_Reader sysVMeminfo(i->ToBytes());
-        if (config_.sysVirtualMemNameMap_.find(SysVMeminfoType(sysVMeminfo.key())) !=
-            config_.sysVirtualMemNameMap_.end()) {
-            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                sysVMemNameDictMap_.at(SysVMeminfoType(sysVMeminfo.key())), timeStamp, sysVMeminfo.value());
+        if (config_.sysVirtualMemNameMap_.find(sysVMeminfo.key()) != config_.sysVirtualMemNameMap_.end()) {
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(sysVMemNameDictMap_.at(sysVMeminfo.key()),
+                                                                             timeStamp, sysVMeminfo.value());
         } else {
             streamFilters_->statFilter_->IncreaseStat(TRACE_SYS_VIRTUAL_MEMORY, STAT_EVENT_DATA_INVALID);
         }
@@ -160,148 +159,148 @@ void HtraceMemParser::ParseMemInfo(const ProtoReader::MemoryData_Reader* tracePa
     for (auto i = tracePacket->meminfo(); i; ++i) {
         ProtoReader::SysMeminfo_Reader sysMeminfo(i->ToBytes());
         switch (sysMeminfo.key()) {
-            case SysMeminfoType::PMEM_UNSPECIFIED:
+            case ProtoReader::PMEM_UNSPECIFIED:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_UNSPECIFIED), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_UNSPECIFIED), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_MEM_TOTAL:
+            case ProtoReader::PMEM_MEM_TOTAL:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_MEM_TOTAL), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_MEM_TOTAL), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_MEM_FREE:
+            case ProtoReader::PMEM_MEM_FREE:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_MEM_FREE), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_MEM_FREE), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_MEM_AVAILABLE:
+            case ProtoReader::PMEM_MEM_AVAILABLE:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_MEM_AVAILABLE), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_MEM_AVAILABLE), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_BUFFERS:
+            case ProtoReader::PMEM_BUFFERS:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_BUFFERS), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_BUFFERS), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_CACHED:
+            case ProtoReader::PMEM_CACHED:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_CACHED), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_CACHED), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_SWAP_CACHED:
+            case ProtoReader::PMEM_SWAP_CACHED:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_SWAP_CACHED), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_SWAP_CACHED), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_ACTIVE:
+            case ProtoReader::PMEM_ACTIVE:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_ACTIVE), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_ACTIVE), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_INACTIVE:
+            case ProtoReader::PMEM_INACTIVE:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_INACTIVE), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_INACTIVE), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_ACTIVE_ANON:
+            case ProtoReader::PMEM_ACTIVE_ANON:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_ACTIVE_ANON), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_ACTIVE_ANON), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_INACTIVE_ANON:
+            case ProtoReader::PMEM_INACTIVE_ANON:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_INACTIVE_ANON), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_INACTIVE_ANON), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_ACTIVE_FILE:
+            case ProtoReader::PMEM_ACTIVE_FILE:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_ACTIVE_FILE), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_ACTIVE_FILE), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_INACTIVE_FILE:
+            case ProtoReader::PMEM_INACTIVE_FILE:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_INACTIVE_FILE), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_INACTIVE_FILE), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_UNEVICTABLE:
+            case ProtoReader::PMEM_UNEVICTABLE:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_UNEVICTABLE), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_UNEVICTABLE), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_MLOCKED:
+            case ProtoReader::PMEM_MLOCKED:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_MLOCKED), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_MLOCKED), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_SWAP_TOTAL:
+            case ProtoReader::PMEM_SWAP_TOTAL:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_SWAP_TOTAL), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_SWAP_TOTAL), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_SWAP_FREE:
+            case ProtoReader::PMEM_SWAP_FREE:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_SWAP_FREE), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_SWAP_FREE), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_DIRTY:
+            case ProtoReader::PMEM_DIRTY:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_DIRTY), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_DIRTY), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_WRITEBACK:
+            case ProtoReader::PMEM_WRITEBACK:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_WRITEBACK), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_WRITEBACK), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_ANON_PAGES:
+            case ProtoReader::PMEM_ANON_PAGES:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_ANON_PAGES), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_ANON_PAGES), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_MAPPED:
+            case ProtoReader::PMEM_MAPPED:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_MAPPED), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_MAPPED), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_SHMEM:
+            case ProtoReader::PMEM_SHMEM:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_SHMEM), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_SHMEM), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_SLAB:
+            case ProtoReader::PMEM_SLAB:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_SLAB), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_SLAB), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_SLAB_RECLAIMABLE:
+            case ProtoReader::PMEM_SLAB_RECLAIMABLE:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_SLAB_RECLAIMABLE), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_SLAB_RECLAIMABLE), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_SLAB_UNRECLAIMABLE:
+            case ProtoReader::PMEM_SLAB_UNRECLAIMABLE:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_SLAB_UNRECLAIMABLE), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_SLAB_UNRECLAIMABLE), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_KERNEL_STACK:
+            case ProtoReader::PMEM_KERNEL_STACK:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_KERNEL_STACK), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_KERNEL_STACK), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_PAGE_TABLES:
+            case ProtoReader::PMEM_PAGE_TABLES:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_PAGE_TABLES), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_PAGE_TABLES), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_COMMIT_LIMIT:
+            case ProtoReader::PMEM_COMMIT_LIMIT:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_COMMIT_LIMIT), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_COMMIT_LIMIT), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_COMMITED_AS:
+            case ProtoReader::PMEM_COMMITED_AS:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_COMMITED_AS), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_COMMITED_AS), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_VMALLOC_TOTAL:
+            case ProtoReader::PMEM_VMALLOC_TOTAL:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_VMALLOC_TOTAL), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_VMALLOC_TOTAL), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_VMALLOC_USED:
+            case ProtoReader::PMEM_VMALLOC_USED:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_VMALLOC_USED), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_VMALLOC_USED), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_VMALLOC_CHUNK:
+            case ProtoReader::PMEM_VMALLOC_CHUNK:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_VMALLOC_CHUNK), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_VMALLOC_CHUNK), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_CMA_TOTAL:
+            case ProtoReader::PMEM_CMA_TOTAL:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_CMA_TOTAL), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_CMA_TOTAL), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_CMA_FREE:
+            case ProtoReader::PMEM_CMA_FREE:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_CMA_FREE), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_CMA_FREE), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType::PMEM_KERNEL_RECLAIMABLE:
+            case ProtoReader::PMEM_KERNEL_RECLAIMABLE:
                 streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(SysMeminfoType::PMEM_KERNEL_RECLAIMABLE), timeStamp, sysMeminfo.value());
+                    sysMemNameDictMap_.at(ProtoReader::PMEM_KERNEL_RECLAIMABLE), timeStamp, sysMeminfo.value());
                 break;
-            case SysMeminfoType_INT_MIN_SENTINEL_DO_NOT_USE_:
-            case SysMeminfoType_INT_MAX_SENTINEL_DO_NOT_USE_:
+            // case SysMeminfoType_INT_MIN_SENTINEL_DO_NOT_USE_:
+            // case SysMeminfoType_INT_MAX_SENTINEL_DO_NOT_USE_:
             default:
                 streamFilters_->statFilter_->IncreaseStat(TRACE_SYS_MEMORY, STAT_EVENT_DATA_INVALID);
                 break;
@@ -315,579 +314,555 @@ void HtraceMemParser::ParseVMemInfo(const ProtoReader::MemoryData_Reader* traceP
     for (auto i = tracePacket->vmeminfo(); i; ++i) {
         ProtoReader::SysVMeminfo_Reader sysVMeminfo(i->ToBytes());
         switch (sysVMeminfo.key()) {
-            case SysVMeminfoType::VMEMINFO_UNSPECIFIED:
+            case ProtoReader::VMEMINFO_UNSPECIFIED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_UNSPECIFIED), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNSPECIFIED), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_FREE_PAGES:
+            case ProtoReader::VMEMINFO_NR_FREE_PAGES:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_FREE_PAGES), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_FREE_PAGES), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ALLOC_BATCH:
+            case ProtoReader::VMEMINFO_NR_ALLOC_BATCH:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ALLOC_BATCH), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ALLOC_BATCH), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_INACTIVE_ANON:
+            case ProtoReader::VMEMINFO_NR_INACTIVE_ANON:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_INACTIVE_ANON), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_INACTIVE_ANON), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ACTIVE_ANON:
+            case ProtoReader::VMEMINFO_NR_ACTIVE_ANON:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ACTIVE_ANON), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ACTIVE_ANON), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_INACTIVE_FILE:
+            case ProtoReader::VMEMINFO_NR_INACTIVE_FILE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_INACTIVE_FILE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_INACTIVE_FILE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ACTIVE_FILE:
+            case ProtoReader::VMEMINFO_NR_ACTIVE_FILE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ACTIVE_FILE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ACTIVE_FILE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_UNEVICTABLE:
+            case ProtoReader::VMEMINFO_NR_UNEVICTABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_UNEVICTABLE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_UNEVICTABLE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_MLOCK:
+            case ProtoReader::VMEMINFO_NR_MLOCK:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_MLOCK), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_MLOCK), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ANON_PAGES:
+            case ProtoReader::VMEMINFO_NR_ANON_PAGES:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ANON_PAGES), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ANON_PAGES), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_MAPPED:
+            case ProtoReader::VMEMINFO_NR_MAPPED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_MAPPED), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_MAPPED), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_FILE_PAGES:
+            case ProtoReader::VMEMINFO_NR_FILE_PAGES:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_FILE_PAGES), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_FILE_PAGES), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_DIRTY:
+            case ProtoReader::VMEMINFO_NR_DIRTY:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_DIRTY), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_DIRTY), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_WRITEBACK:
+            case ProtoReader::VMEMINFO_NR_WRITEBACK:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_WRITEBACK), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_WRITEBACK), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_SLAB_RECLAIMABLE:
+            case ProtoReader::VMEMINFO_NR_SLAB_RECLAIMABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_SLAB_RECLAIMABLE), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SLAB_RECLAIMABLE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_SLAB_UNRECLAIMABLE:
+            case ProtoReader::VMEMINFO_NR_SLAB_UNRECLAIMABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_SLAB_UNRECLAIMABLE), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SLAB_UNRECLAIMABLE), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_PAGE_TABLE_PAGES:
+            case ProtoReader::VMEMINFO_NR_PAGE_TABLE_PAGES:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_PAGE_TABLE_PAGES), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_PAGE_TABLE_PAGES), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_KERNEL_STACK:
+            case ProtoReader::VMEMINFO_NR_KERNEL_STACK:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_KERNEL_STACK), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_KERNEL_STACK), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_OVERHEAD:
+            case ProtoReader::VMEMINFO_NR_OVERHEAD:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_OVERHEAD), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_OVERHEAD), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_UNSTABLE:
+            case ProtoReader::VMEMINFO_NR_UNSTABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_UNSTABLE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_UNSTABLE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_BOUNCE:
+            case ProtoReader::VMEMINFO_NR_BOUNCE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_BOUNCE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_BOUNCE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_VMSCAN_WRITE:
+            case ProtoReader::VMEMINFO_NR_VMSCAN_WRITE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_VMSCAN_WRITE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_VMSCAN_WRITE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_VMSCAN_IMMEDIATE_RECLAIM:
+            case ProtoReader::VMEMINFO_NR_VMSCAN_IMMEDIATE_RECLAIM:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_VMSCAN_IMMEDIATE_RECLAIM), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_VMSCAN_IMMEDIATE_RECLAIM), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_WRITEBACK_TEMP:
+            case ProtoReader::VMEMINFO_NR_WRITEBACK_TEMP:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_WRITEBACK_TEMP), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_WRITEBACK_TEMP), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ISOLATED_ANON:
+            case ProtoReader::VMEMINFO_NR_ISOLATED_ANON:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ISOLATED_ANON), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ISOLATED_ANON), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ISOLATED_FILE:
+            case ProtoReader::VMEMINFO_NR_ISOLATED_FILE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ISOLATED_FILE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ISOLATED_FILE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_SHMEM:
+            case ProtoReader::VMEMINFO_NR_SHMEM:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_SHMEM), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SHMEM), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_DIRTIED:
+            case ProtoReader::VMEMINFO_NR_DIRTIED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_DIRTIED), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_DIRTIED), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_WRITTEN:
+            case ProtoReader::VMEMINFO_NR_WRITTEN:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_WRITTEN), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_WRITTEN), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_PAGES_SCANNED:
+            case ProtoReader::VMEMINFO_NR_PAGES_SCANNED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_PAGES_SCANNED), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_PAGES_SCANNED), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_WORKINGSET_REFAULT:
+            case ProtoReader::VMEMINFO_WORKINGSET_REFAULT:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_WORKINGSET_REFAULT), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_WORKINGSET_REFAULT), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_WORKINGSET_ACTIVATE:
+            case ProtoReader::VMEMINFO_WORKINGSET_ACTIVATE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_WORKINGSET_ACTIVATE), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_WORKINGSET_ACTIVATE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_WORKINGSET_NODERECLAIM:
+            case ProtoReader::VMEMINFO_WORKINGSET_NODERECLAIM:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_WORKINGSET_NODERECLAIM), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_WORKINGSET_NODERECLAIM), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ANON_TRANSPARENT_HUGEPAGES:
+            case ProtoReader::VMEMINFO_NR_ANON_TRANSPARENT_HUGEPAGES:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ANON_TRANSPARENT_HUGEPAGES), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ANON_TRANSPARENT_HUGEPAGES), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_FREE_CMA:
+            case ProtoReader::VMEMINFO_NR_FREE_CMA:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_FREE_CMA), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_FREE_CMA), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_SWAPCACHE:
+            case ProtoReader::VMEMINFO_NR_SWAPCACHE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_SWAPCACHE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SWAPCACHE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_DIRTY_THRESHOLD:
+            case ProtoReader::VMEMINFO_NR_DIRTY_THRESHOLD:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_DIRTY_THRESHOLD), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_DIRTY_THRESHOLD), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_DIRTY_BACKGROUND_THRESHOLD:
+            case ProtoReader::VMEMINFO_NR_DIRTY_BACKGROUND_THRESHOLD:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_DIRTY_BACKGROUND_THRESHOLD), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_DIRTY_BACKGROUND_THRESHOLD), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGPGIN:
+            case ProtoReader::VMEMINFO_PGPGIN:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGPGIN), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGPGIN), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGPGOUT:
+            case ProtoReader::VMEMINFO_PGPGOUT:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGPGOUT), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGPGOUT), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGPGOUTCLEAN:
+            case ProtoReader::VMEMINFO_PGPGOUTCLEAN:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGPGOUTCLEAN), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGPGOUTCLEAN), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PSWPIN:
+            case ProtoReader::VMEMINFO_PSWPIN:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PSWPIN), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PSWPIN), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PSWPOUT:
+            case ProtoReader::VMEMINFO_PSWPOUT:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PSWPOUT), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PSWPOUT), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGALLOC_DMA:
+            case ProtoReader::VMEMINFO_PGALLOC_DMA:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGALLOC_DMA), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGALLOC_DMA), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGALLOC_NORMAL:
+            case ProtoReader::VMEMINFO_PGALLOC_NORMAL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGALLOC_NORMAL), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGALLOC_NORMAL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGALLOC_MOVABLE:
+            case ProtoReader::VMEMINFO_PGALLOC_MOVABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGALLOC_MOVABLE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGALLOC_MOVABLE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGFREE:
+            case ProtoReader::VMEMINFO_PGFREE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGFREE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGFREE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGACTIVATE:
+            case ProtoReader::VMEMINFO_PGACTIVATE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGACTIVATE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGACTIVATE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGDEACTIVATE:
+            case ProtoReader::VMEMINFO_PGDEACTIVATE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGDEACTIVATE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGDEACTIVATE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGFAULT:
+            case ProtoReader::VMEMINFO_PGFAULT:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGFAULT), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGFAULT), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGMAJFAULT:
+            case ProtoReader::VMEMINFO_PGMAJFAULT:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGMAJFAULT), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGMAJFAULT), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGREFILL_DMA:
+            case ProtoReader::VMEMINFO_PGREFILL_DMA:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGREFILL_DMA), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGREFILL_DMA), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGREFILL_NORMAL:
+            case ProtoReader::VMEMINFO_PGREFILL_NORMAL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGREFILL_NORMAL), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGREFILL_NORMAL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGREFILL_MOVABLE:
+            case ProtoReader::VMEMINFO_PGREFILL_MOVABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGREFILL_MOVABLE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGREFILL_MOVABLE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSTEAL_KSWAPD_DMA:
+            case ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_DMA:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSTEAL_KSWAPD_DMA), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_DMA), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSTEAL_KSWAPD_NORMAL:
+            case ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_NORMAL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSTEAL_KSWAPD_NORMAL), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_NORMAL), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSTEAL_KSWAPD_MOVABLE:
+            case ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_MOVABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSTEAL_KSWAPD_MOVABLE), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_MOVABLE), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSTEAL_DIRECT_DMA:
+            case ProtoReader::VMEMINFO_PGSTEAL_DIRECT_DMA:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSTEAL_DIRECT_DMA), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_DIRECT_DMA), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSTEAL_DIRECT_NORMAL:
+            case ProtoReader::VMEMINFO_PGSTEAL_DIRECT_NORMAL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSTEAL_DIRECT_NORMAL), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_DIRECT_NORMAL), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSTEAL_DIRECT_MOVABLE:
+            case ProtoReader::VMEMINFO_PGSTEAL_DIRECT_MOVABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSTEAL_DIRECT_MOVABLE), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_DIRECT_MOVABLE), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSCAN_KSWAPD_DMA:
+            case ProtoReader::VMEMINFO_PGSCAN_KSWAPD_DMA:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSCAN_KSWAPD_DMA), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_KSWAPD_DMA), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSCAN_KSWAPD_NORMAL:
+            case ProtoReader::VMEMINFO_PGSCAN_KSWAPD_NORMAL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSCAN_KSWAPD_NORMAL), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_KSWAPD_NORMAL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSCAN_KSWAPD_MOVABLE:
+            case ProtoReader::VMEMINFO_PGSCAN_KSWAPD_MOVABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSCAN_KSWAPD_MOVABLE), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_KSWAPD_MOVABLE), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSCAN_DIRECT_DMA:
+            case ProtoReader::VMEMINFO_PGSCAN_DIRECT_DMA:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSCAN_DIRECT_DMA), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT_DMA), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSCAN_DIRECT_NORMAL:
+            case ProtoReader::VMEMINFO_PGSCAN_DIRECT_NORMAL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSCAN_DIRECT_NORMAL), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT_NORMAL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSCAN_DIRECT_MOVABLE:
+            case ProtoReader::VMEMINFO_PGSCAN_DIRECT_MOVABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSCAN_DIRECT_MOVABLE), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT_MOVABLE), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSCAN_DIRECT_THROTTLE:
+            case ProtoReader::VMEMINFO_PGSCAN_DIRECT_THROTTLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSCAN_DIRECT_THROTTLE), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT_THROTTLE), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGINODESTEAL:
+            case ProtoReader::VMEMINFO_PGINODESTEAL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGINODESTEAL), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGINODESTEAL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_SLABS_SCANNED:
+            case ProtoReader::VMEMINFO_SLABS_SCANNED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_SLABS_SCANNED), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_SLABS_SCANNED), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_KSWAPD_INODESTEAL:
+            case ProtoReader::VMEMINFO_KSWAPD_INODESTEAL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_KSWAPD_INODESTEAL), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_KSWAPD_INODESTEAL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_KSWAPD_LOW_WMARK_HIT_QUICKLY:
+            case ProtoReader::VMEMINFO_KSWAPD_LOW_WMARK_HIT_QUICKLY:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_KSWAPD_LOW_WMARK_HIT_QUICKLY), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_KSWAPD_LOW_WMARK_HIT_QUICKLY), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_KSWAPD_HIGH_WMARK_HIT_QUICKLY:
+            case ProtoReader::VMEMINFO_KSWAPD_HIGH_WMARK_HIT_QUICKLY:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_KSWAPD_HIGH_WMARK_HIT_QUICKLY), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_KSWAPD_HIGH_WMARK_HIT_QUICKLY), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PAGEOUTRUN:
+            case ProtoReader::VMEMINFO_PAGEOUTRUN:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PAGEOUTRUN), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PAGEOUTRUN), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_ALLOCSTALL:
+            case ProtoReader::VMEMINFO_ALLOCSTALL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_ALLOCSTALL), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_ALLOCSTALL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGROTATED:
+            case ProtoReader::VMEMINFO_PGROTATED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGROTATED), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGROTATED), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_DROP_PAGECACHE:
+            case ProtoReader::VMEMINFO_DROP_PAGECACHE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_DROP_PAGECACHE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_DROP_PAGECACHE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_DROP_SLAB:
+            case ProtoReader::VMEMINFO_DROP_SLAB:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_DROP_SLAB), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_DROP_SLAB), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGMIGRATE_SUCCESS:
+            case ProtoReader::VMEMINFO_PGMIGRATE_SUCCESS:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGMIGRATE_SUCCESS), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGMIGRATE_SUCCESS), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGMIGRATE_FAIL:
+            case ProtoReader::VMEMINFO_PGMIGRATE_FAIL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGMIGRATE_FAIL), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGMIGRATE_FAIL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_COMPACT_MIGRATE_SCANNED:
+            case ProtoReader::VMEMINFO_COMPACT_MIGRATE_SCANNED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_COMPACT_MIGRATE_SCANNED), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_MIGRATE_SCANNED), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_COMPACT_FREE_SCANNED:
+            case ProtoReader::VMEMINFO_COMPACT_FREE_SCANNED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_COMPACT_FREE_SCANNED), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_FREE_SCANNED), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_COMPACT_ISOLATED:
+            case ProtoReader::VMEMINFO_COMPACT_ISOLATED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_COMPACT_ISOLATED), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_ISOLATED), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_COMPACT_STALL:
+            case ProtoReader::VMEMINFO_COMPACT_STALL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_COMPACT_STALL), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_STALL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_COMPACT_FAIL:
+            case ProtoReader::VMEMINFO_COMPACT_FAIL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_COMPACT_FAIL), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_FAIL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_COMPACT_SUCCESS:
+            case ProtoReader::VMEMINFO_COMPACT_SUCCESS:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_COMPACT_SUCCESS), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_SUCCESS), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_COMPACT_DAEMON_WAKE:
+            case ProtoReader::VMEMINFO_COMPACT_DAEMON_WAKE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_COMPACT_DAEMON_WAKE), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_DAEMON_WAKE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_UNEVICTABLE_PGS_CULLED:
+            case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_CULLED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_UNEVICTABLE_PGS_CULLED), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_CULLED), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_UNEVICTABLE_PGS_SCANNED:
+            case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_SCANNED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_UNEVICTABLE_PGS_SCANNED), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_SCANNED), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_UNEVICTABLE_PGS_RESCUED:
+            case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_RESCUED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_UNEVICTABLE_PGS_RESCUED), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_RESCUED), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_UNEVICTABLE_PGS_MLOCKED:
+            case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_MLOCKED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_UNEVICTABLE_PGS_MLOCKED), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_MLOCKED), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_UNEVICTABLE_PGS_MUNLOCKED:
+            case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_MUNLOCKED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_UNEVICTABLE_PGS_MUNLOCKED), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_MUNLOCKED), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_UNEVICTABLE_PGS_CLEARED:
+            case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_CLEARED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_UNEVICTABLE_PGS_CLEARED), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_CLEARED), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_UNEVICTABLE_PGS_STRANDED:
+            case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_STRANDED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_UNEVICTABLE_PGS_STRANDED), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_STRANDED), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ZSPAGES:
+            case ProtoReader::VMEMINFO_NR_ZSPAGES:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ZSPAGES), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZSPAGES), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ION_HEAP:
+            case ProtoReader::VMEMINFO_NR_ION_HEAP:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ION_HEAP), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ION_HEAP), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_GPU_HEAP:
+            case ProtoReader::VMEMINFO_NR_GPU_HEAP:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_GPU_HEAP), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_GPU_HEAP), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_ALLOCSTALL_DMA:
+            case ProtoReader::VMEMINFO_ALLOCSTALL_DMA:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_ALLOCSTALL_DMA), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_ALLOCSTALL_DMA), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_ALLOCSTALL_MOVABLE:
+            case ProtoReader::VMEMINFO_ALLOCSTALL_MOVABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_ALLOCSTALL_MOVABLE), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_ALLOCSTALL_MOVABLE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_ALLOCSTALL_NORMAL:
+            case ProtoReader::VMEMINFO_ALLOCSTALL_NORMAL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_ALLOCSTALL_NORMAL), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_ALLOCSTALL_NORMAL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_COMPACT_DAEMON_FREE_SCANNED:
+            case ProtoReader::VMEMINFO_COMPACT_DAEMON_FREE_SCANNED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_COMPACT_DAEMON_FREE_SCANNED), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_DAEMON_FREE_SCANNED), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_COMPACT_DAEMON_MIGRATE_SCANNED:
+            case ProtoReader::VMEMINFO_COMPACT_DAEMON_MIGRATE_SCANNED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_COMPACT_DAEMON_MIGRATE_SCANNED), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_DAEMON_MIGRATE_SCANNED), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_FASTRPC:
+            case ProtoReader::VMEMINFO_NR_FASTRPC:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_FASTRPC), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_FASTRPC), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_INDIRECTLY_RECLAIMABLE:
+            case ProtoReader::VMEMINFO_NR_INDIRECTLY_RECLAIMABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_INDIRECTLY_RECLAIMABLE), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_INDIRECTLY_RECLAIMABLE), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ION_HEAP_POOL:
+            case ProtoReader::VMEMINFO_NR_ION_HEAP_POOL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ION_HEAP_POOL), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ION_HEAP_POOL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_KERNEL_MISC_RECLAIMABLE:
+            case ProtoReader::VMEMINFO_NR_KERNEL_MISC_RECLAIMABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_KERNEL_MISC_RECLAIMABLE), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_KERNEL_MISC_RECLAIMABLE), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_SHADOW_CALL_STACK_BYTES:
+            case ProtoReader::VMEMINFO_NR_SHADOW_CALL_STACK_BYTES:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_SHADOW_CALL_STACK_BYTES), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SHADOW_CALL_STACK_BYTES), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_SHMEM_HUGEPAGES:
+            case ProtoReader::VMEMINFO_NR_SHMEM_HUGEPAGES:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_SHMEM_HUGEPAGES), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SHMEM_HUGEPAGES), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_SHMEM_PMDMAPPED:
+            case ProtoReader::VMEMINFO_NR_SHMEM_PMDMAPPED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_SHMEM_PMDMAPPED), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SHMEM_PMDMAPPED), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_UNRECLAIMABLE_PAGES:
+            case ProtoReader::VMEMINFO_NR_UNRECLAIMABLE_PAGES:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_UNRECLAIMABLE_PAGES), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_UNRECLAIMABLE_PAGES), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ZONE_ACTIVE_ANON:
+            case ProtoReader::VMEMINFO_NR_ZONE_ACTIVE_ANON:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ZONE_ACTIVE_ANON), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_ACTIVE_ANON), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ZONE_ACTIVE_FILE:
+            case ProtoReader::VMEMINFO_NR_ZONE_ACTIVE_FILE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ZONE_ACTIVE_FILE), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_ACTIVE_FILE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ZONE_INACTIVE_ANON:
+            case ProtoReader::VMEMINFO_NR_ZONE_INACTIVE_ANON:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ZONE_INACTIVE_ANON), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_INACTIVE_ANON), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ZONE_INACTIVE_FILE:
+            case ProtoReader::VMEMINFO_NR_ZONE_INACTIVE_FILE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ZONE_INACTIVE_FILE), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_INACTIVE_FILE), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ZONE_UNEVICTABLE:
+            case ProtoReader::VMEMINFO_NR_ZONE_UNEVICTABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ZONE_UNEVICTABLE), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_UNEVICTABLE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_NR_ZONE_WRITE_PENDING:
+            case ProtoReader::VMEMINFO_NR_ZONE_WRITE_PENDING:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_NR_ZONE_WRITE_PENDING), timeStamp,
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_WRITE_PENDING), timeStamp,
                     sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_OOM_KILL:
+            case ProtoReader::VMEMINFO_OOM_KILL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_OOM_KILL), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_OOM_KILL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGLAZYFREE:
+            case ProtoReader::VMEMINFO_PGLAZYFREE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGLAZYFREE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGLAZYFREE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGLAZYFREED:
+            case ProtoReader::VMEMINFO_PGLAZYFREED:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGLAZYFREED), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGLAZYFREED), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGREFILL:
+            case ProtoReader::VMEMINFO_PGREFILL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGREFILL), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGREFILL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSCAN_DIRECT:
+            case ProtoReader::VMEMINFO_PGSCAN_DIRECT:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSCAN_DIRECT), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSCAN_KSWAPD:
+            case ProtoReader::VMEMINFO_PGSCAN_KSWAPD:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSCAN_KSWAPD), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_KSWAPD), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSKIP_DMA:
+            case ProtoReader::VMEMINFO_PGSKIP_DMA:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSKIP_DMA), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSKIP_DMA), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSKIP_MOVABLE:
+            case ProtoReader::VMEMINFO_PGSKIP_MOVABLE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSKIP_MOVABLE), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSKIP_MOVABLE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSKIP_NORMAL:
+            case ProtoReader::VMEMINFO_PGSKIP_NORMAL:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSKIP_NORMAL), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSKIP_NORMAL), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSTEAL_DIRECT:
+            case ProtoReader::VMEMINFO_PGSTEAL_DIRECT:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSTEAL_DIRECT), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_DIRECT), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_PGSTEAL_KSWAPD:
+            case ProtoReader::VMEMINFO_PGSTEAL_KSWAPD:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_PGSTEAL_KSWAPD), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_KSWAPD), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_SWAP_RA:
+            case ProtoReader::VMEMINFO_SWAP_RA:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_SWAP_RA), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_SWAP_RA), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_SWAP_RA_HIT:
+            case ProtoReader::VMEMINFO_SWAP_RA_HIT:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_SWAP_RA_HIT), timeStamp, sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_SWAP_RA_HIT), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType::VMEMINFO_WORKINGSET_RESTORE:
+            case ProtoReader::VMEMINFO_WORKINGSET_RESTORE:
                 streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(SysVMeminfoType::VMEMINFO_WORKINGSET_RESTORE), timeStamp,
-                    sysVMeminfo.value());
+                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_WORKINGSET_RESTORE), timeStamp, sysVMeminfo.value());
                 break;
-            case SysVMeminfoType_INT_MIN_SENTINEL_DO_NOT_USE_:
-            case SysVMeminfoType_INT_MAX_SENTINEL_DO_NOT_USE_:
+            // case SysVMeminfoType_INT_MIN_SENTINEL_DO_NOT_USE_:
+            // case SysVMeminfoType_INT_MAX_SENTINEL_DO_NOT_USE_:
             default:
                 streamFilters_->statFilter_->IncreaseStat(TRACE_SYS_VIRTUAL_MEMORY, STAT_EVENT_DATA_INVALID);
         }
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.h b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.h
index 5d5e514b5f4b252976069c68beac9b4e500e29e3..b16cbe1218ccca70b7d9255bb4b845bc02077e8b 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.h
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.h
@@ -44,8 +44,8 @@ private:
     void ParseVMemInfoEasy(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const;
     void ParseSmapsInfoEasy(const ProtoReader::ProcessMemoryInfo_Reader* memInfo, uint64_t timeStamp) const;
     std::map<MemInfoType, DataIndex> memNameDictMap_ = {};
-    std::map<SysMeminfoType, DataIndex> sysMemNameDictMap_ = {};
-    std::map<SysVMeminfoType, DataIndex> sysVMemNameDictMap_ = {};
+    std::map<uint32_t, DataIndex> sysMemNameDictMap_ = {};
+    std::map<uint32_t, DataIndex> sysVMemNameDictMap_ = {};
     uint64_t zram_ = 0;
     const DataIndex zramIndex_ = traceDataCache_->GetDataIndex("sys.mem.zram");
     TraceStreamerConfig config_{};
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_native_hook_parser.h b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_native_hook_parser.h
index 4f11adec1b48470c5df59d1487f9153e0d1e8ae9..0a4de961292dfcb02220354d632e0015d9e61105 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_native_hook_parser.h
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_native_hook_parser.h
@@ -22,9 +22,7 @@
 #include "event_parser_base.h"
 #include "htrace_event_parser.h"
 #include "htrace_plugin_time_parser.h"
-#include "native_hook_config.pbreader.h"
 #include "native_hook_filter.h"
-#include "native_hook_result.pbreader.h"
 #include "offline_symbolization_filter.h"
 #include "trace_streamer_config.h"
 #include "trace_streamer_filters.h"
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_network_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_network_parser.cpp
index 7fdf3b7474a96da9c2bc01813a10c862983fc281..49597383fb5dd78ef84409c9335786fe7208c79d 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_network_parser.cpp
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_network_parser.cpp
@@ -15,6 +15,7 @@
 #include "htrace_network_parser.h"
 #include "clock_filter_ex.h"
 #include "htrace_event_parser.h"
+#include "network_plugin_result.pbreader.h"
 #include "process_filter.h"
 #include "stat_filter.h"
 namespace SysTuning {
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.cpp
index 29555808c964cd0b4847b20a93874c45b9893f25..1ec826d1be85fd77eb89c8befff13e246c7dd6de 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.cpp
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.cpp
@@ -16,12 +16,12 @@
 #include "htrace_parser.h"
 #include <unistd.h>
 #include "binder_filter.h"
+#include "common_types.pbreader.h"
 #include "cpu_filter.h"
 #include "data_area.h"
 #include "ftrace_event.pbreader.h"
 #include "log.h"
 #include "memory_plugin_result.pbreader.h"
-#include "services/common_types.pbreader.h"
 #include "stat_filter.h"
 #include "trace_plugin_result.pbreader.h"
 #if IS_WASM
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.h b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.h
index ad85bfc9166430d3ee5b9323a341be56b703afa4..44d4a03193edd049d3dcce59d17ea4eda88f78ad 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.h
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.h
@@ -22,6 +22,7 @@
 #include <string>
 #include <thread>
 #include "common_types.h"
+#include "common_types.pbreader.h"
 #include "ebpf_data_parser.h"
 #include "elf_parser.h"
 #include "file.h"
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_process_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_process_parser.cpp
index fa29e942ec974dd18c95d38cfb6af27dccf081ce..ce5e91ddfe03e19590712e870ccaa360345a1b9d 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_process_parser.cpp
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_process_parser.cpp
@@ -14,8 +14,14 @@
  */
 #include "htrace_process_parser.h"
 #include "clock_filter_ex.h"
+#include "cpu_plugin_config.pbreader.h"
+#include "cpu_plugin_result.pbreader.h"
+#include "diskio_plugin_config.pbreader.h"
+#include "diskio_plugin_result.pbreader.h"
 #include "htrace_event_parser.h"
 #include "process_filter.h"
+#include "process_plugin_config.pbreader.h"
+#include "process_plugin_result.pbreader.h"
 #include "stat_filter.h"
 namespace SysTuning {
 namespace TraceStreamer {
diff --git a/trace_streamer/src/parser/thread_state.cpp b/trace_streamer/src/parser/thread_state_flag.cpp
similarity index 86%
rename from trace_streamer/src/parser/thread_state.cpp
rename to trace_streamer/src/parser/thread_state_flag.cpp
index a373a7855acd5ae90291c03526b82dbb94b5895a..ce94ba49d9d1284fe61f8789197f2009510db79e 100644
--- a/trace_streamer/src/parser/thread_state.cpp
+++ b/trace_streamer/src/parser/thread_state_flag.cpp
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-#include "thread_state.h"
+#include "thread_state_flag.h"
 
 namespace SysTuning {
 namespace TraceStreamer {
-Direction ThreadState::SetStatByChar(char ch)
+Direction ThreadStateFlag::SetStatByChar(char ch)
 {
     if (ch == 'R') {
         if (state_ == 0) {
@@ -33,7 +33,7 @@ Direction ThreadState::SetStatByChar(char ch)
     return NEED_GO;
 }
 
-void ThreadState::ProcessSate(const std::string& stateStr)
+void ThreadStateFlag::ProcessSate(const std::string& stateStr)
 {
     for (size_t i = 0; i < stateStr.size(); i++) {
         if (stateStr[i] == '+') {
@@ -52,7 +52,7 @@ void ThreadState::ProcessSate(const std::string& stateStr)
     }
 }
 
-ThreadState::ThreadState(const std::string& stateStr)
+ThreadStateFlag::ThreadStateFlag(const std::string& stateStr)
 {
     ProcessSate(stateStr);
 }
diff --git a/trace_streamer/src/parser/thread_state.h b/trace_streamer/src/parser/thread_state_flag.h
similarity index 94%
rename from trace_streamer/src/parser/thread_state.h
rename to trace_streamer/src/parser/thread_state_flag.h
index 23a741534950ae38d545d69a4b500dc9c42738ca..b31a58b85e761238c29a3c0f0a16d1f074b553ef 100644
--- a/trace_streamer/src/parser/thread_state.h
+++ b/trace_streamer/src/parser/thread_state_flag.h
@@ -38,10 +38,10 @@ enum Stat : uint32_t {
     TASKNEW = 2048,
     VALID = 0X8000,
 };
-class ThreadState {
+class ThreadStateFlag {
 public:
-    explicit ThreadState(const std::string& stateStr);
-    ~ThreadState() {}
+    explicit ThreadStateFlag(const std::string& stateStr);
+    ~ThreadStateFlag() {}
 
     uint32_t State() const
     {
diff --git a/trace_streamer/src/proto_reader/BUILD.gn b/trace_streamer/src/proto_reader/BUILD.gn
index b70ee69c8ea545282345a59144fa0a6344715b62..531f7ab8fb12cea0cea992dfb65f27253e84d250 100755
--- a/trace_streamer/src/proto_reader/BUILD.gn
+++ b/trace_streamer/src/proto_reader/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../build/ohos.gni")
+import("//build/ohos.gni")
 import("../../build/ts.gni")
 ohos_source_set("proto_reader") {
   subsystem_name = "trace_streamer"
diff --git a/trace_streamer/src/proto_reader/include/proto_reader.h b/trace_streamer/src/proto_reader/include/proto_reader.h
index 68bf3003f1911b583a7cca558df25862d04c792c..ef6be8479426329055f66c492b1f79693ca368d6 100644
--- a/trace_streamer/src/proto_reader/include/proto_reader.h
+++ b/trace_streamer/src/proto_reader/include/proto_reader.h
@@ -157,7 +157,7 @@ public:
             }
         } else { // kFixed32 or kFixed64
             auto step = fixedTypeToSizeMap_.at(wireType);
-            memcpy(&currentValue_, currentReadAddr_, sizeof(cppType));
+            memcpy_s(&currentValue_, sizeof(cppType), currentReadAddr_, sizeof(cppType));
             currentReadAddr_ += step;
         }
 
diff --git a/trace_streamer/src/proto_reader/protoc_plugin/BUILD.gn b/trace_streamer/src/proto_reader/protoc_plugin/BUILD.gn
index 6ed47f88cc089355dfcc574a1575ed98a19112fe..6cba620cf1bc19174a4562b4a4b4ea2d3d09d7f0 100755
--- a/trace_streamer/src/proto_reader/protoc_plugin/BUILD.gn
+++ b/trace_streamer/src/proto_reader/protoc_plugin/BUILD.gn
@@ -10,18 +10,18 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import("//build/ohos.gni")
 import("../../../build/ts.gni")
-if (target != "wasm") {
-  executable("protoreader_plugin") {
-    sources = [ "proto_reader_plugin.cpp" ]
-    deps = [
-      "${SRC}/base:base",
-      "${THIRD_PARTY}/protobuf:protoc",
-      "${THIRD_PARTY}/protobuf:protoc_lib",
-    ]
-    include_dirs = [
-      "${SRC}/base",
-      "${THIRD_PARTY}/protobuf/src",
-    ]
-  }
+ohos_executable("protoreader_plugin") {
+  subsystem_name = "protoreader_plugin"
+  part_name = "protoreader_plugin"
+  sources = [ "proto_reader_plugin.cpp" ]
+  deps = [
+    "${SRC}/base:string_help",
+    "${THIRD_PARTY}/protobuf:protoc_lib",
+  ]
+  include_dirs = [
+    "${SRC}/base",
+    "${THIRD_PARTY}/protobuf/src",
+  ]
 }
diff --git a/trace_streamer/src/protos/protogen.sh b/trace_streamer/src/protos/protogen.sh
index d88cb258c642d8e0c5763519d1657532f5a26f78..2990fdc00de7a95f194932fe5af7180df0f8c3ed 100755
--- a/trace_streamer/src/protos/protogen.sh
+++ b/trace_streamer/src/protos/protogen.sh
@@ -15,10 +15,16 @@ set -e
 protoc='protoc'
 proto_dir='.'
 protoreader_plugin='protoreader_plugin'
+# case "$OSTYPE" in
+#   msys*)    out='../../out/windows' protoreader_plugin='protoreader_plugin.exe' protoc='protoc.exe' proto_dir=$( cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) ;;
+#   darwin*)  out='../../out/macx' proto_dir=$( cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) ;;
+#   linux*)   out='../../out/linux'  proto_dir=$( cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) ;;
+#   *)        echo "other: $OSTYPE" ;;
+# esac
 case "$OSTYPE" in
-  msys*)    out='../../out/windows' protoreader_plugin='protoreader_plugin.exe' protoc='protoc.exe' proto_dir=$( cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) ;;
-  darwin*)  out='../../out/macx' proto_dir=$( cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) ;;
-  linux*)   out='../../out/linux'  proto_dir=$( cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) ;;
+  msys*)    out='../out/windows' protoreader_plugin='protoreader_plugin.exe' protoc='protoc.exe' proto_dir=$( cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) ;;
+  darwin*)  out='../out/macx' proto_dir=$( cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) ;;
+  linux*)   out='../out/linux'  proto_dir=$( cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) ;;
   *)        echo "other: $OSTYPE" ;;
 esac
 echo $proto_dir
@@ -106,6 +112,8 @@ do
    cppout=../../third_party/protogen/$newpath
    mkdir -p $cppout
    $out/$protoc --proto_path=$memory_data_dir:$native_hook_dir:$hidump_data_dir:$hilog_data_dir:$ftrace_data_dir:$js_memory_dir:$services_dir:$network_data_dir:$cpu_data_dir:$diskio_data_dir:$process_data_dir:$hisysevent_data_dir:$test_data_dir --cpp_out=$cppout ${proto_array[$i]}
+   echo "----$out/$protoc --proto_path=$memory_data_dir:$native_hook_dir:$hidump_data_dir:$hilog_data_dir:$ftrace_data_dir:$js_memory_dir:$services_dir:$network_data_dir:$cpu_data_dir:$diskio_data_dir:$process_data_dir:$hisysevent_data_dir:$test_data_dir --plugin=protoc-gen-plugin=$out/$protoreader_plugin --plugin_out=wrapper_namespace=ProtoReader:$cppout ${proto_array[$i]}---"
+  #  $out/$protoc --proto_path=$memory_data_dir:$native_hook_dir:$hidump_data_dir:$hilog_data_dir:$ftrace_data_dir:$js_memory_dir:$services_dir:$network_data_dir:$cpu_data_dir:$diskio_data_dir:$process_data_dir:$hisysevent_data_dir:$test_data_dir --plugin=protoc-gen-plugin=$out/$protoreader_plugin --plugin_out=wrapper_namespace=ProtoReader:$cppout ${proto_array[$i]}
    $out/$protoc --proto_path=$memory_data_dir:$native_hook_dir:$hidump_data_dir:$hilog_data_dir:$ftrace_data_dir:$js_memory_dir:$services_dir:$network_data_dir:$cpu_data_dir:$diskio_data_dir:$process_data_dir:$hisysevent_data_dir:$test_data_dir --plugin=protoc-gen-plugin=$out/$protoreader_plugin --plugin_out=wrapper_namespace=ProtoReader:$cppout ${proto_array[$i]}
 done
 echo "generate proto based files over"
diff --git a/trace_streamer/src/protos/protos.gni b/trace_streamer/src/protos/protos.gni
index f8582402a8b542f4435fdeda2e18278b1bd725e7..b4c7ee7949f27d613cfe0d697a258b4fc675eb43 100755
--- a/trace_streamer/src/protos/protos.gni
+++ b/trace_streamer/src/protos/protos.gni
@@ -11,21 +11,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../build/config.gni")
+import("../../build/config.gni")
 
 subsys_name = OHOS_PROFILER_SUBSYS_NAME
 part_name = OHOS_PROFILER_PART_NAME
-subsys_x64_out = "clang_x64/$subsys_name/$part_name"
+
+# subsys_x64_out = "clang_x64/$subsys_name/$part_name"
 libc_dir_proto = rebase_path("$asdk_libs_dir", "//")
 root_output_dir_proto = rebase_path("$root_out_dir", "//")
 
 #host:clang_x64 default:arm mingw:mingw_x86_64
 if (current_toolchain != host_toolchain) {
   if (current_toolchain == default_toolchain) {
-    root_output_dir_proto = "$root_output_dir_proto/clang_x64"
+    root_output_dir_proto = "$root_output_dir_proto/$clang_x64_folder"
   } else {
     root_output_dir_proto =
-        get_path_info("$root_output_dir_proto", "dir") + "/clang_x64"
+        get_path_info("$root_output_dir_proto", "dir") + "/$clang_x64_folder"
   }
 }
 protoc = root_output_dir_proto
diff --git a/trace_streamer/src/protos/services/BUILD.gn b/trace_streamer/src/protos/services/BUILD.gn
index 6829542564bc43fd4cdab66ec8578d1e00d74351..a9ef5f82fb21fa39512a50d2647517647f19f864 100755
--- a/trace_streamer/src/protos/services/BUILD.gn
+++ b/trace_streamer/src/protos/services/BUILD.gn
@@ -14,212 +14,67 @@
 import("//build/ohos.gni")
 import("../protos.gni")
 
-proto_types_defines = [
-  "./common_types.proto",
-  "./plugin_service_types.proto",
-  "./profiler_service_types.proto",
-]
-
-plugin_services_defines = [ "./plugin_service.proto" ]
-
-profiler_services_defines = [ "./profiler_service.proto" ]
-
 #######################################################
 proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
-print("proto_out_dir", proto_out_dir, proto_rel_out_dir)
-
-grpc_cpp_plugin = "$subsys_x64_out/grpc_cpp_plugin"
-ipc_cpp_plugin = "$subsys_x64_out/protoc_gen_ipc"
-
-#######################################################
-proto_types_codegen = []
-foreach(proto, proto_types_defines) {
-  name = get_path_info(proto, "name")
-  proto_types_codegen += [
-    "$proto_out_dir/$name.pb.h",
-    "$proto_out_dir/$name.pb.cc",
-  ]
-}
-
-action("service_types_proto_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
-  sources = proto_types_defines
-  outputs = proto_types_codegen
-  args = [
-    "$libc_dir_proto",
-    "$root_output_dir_proto",
-    "--cpp_out",
-    "$proto_rel_out_dir",
-    "--proto_path",
-    rebase_path(".", root_build_dir),
-  ]
-  args += rebase_path(sources, root_build_dir)
-  deps = [
-    "${OHOS_PROFILER_3RDPARTY_GRPC_DIR}:grpc_cpp_plugin(${host_toolchain})",
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})",
-  ]
-}
-
-config("service_types_proto_config") {
-  include_dirs = [ "$proto_out_dir" ]
-}
-
-source_set("service_types_proto") {
-  deps = [ ":service_types_proto_gen" ]
-  public_deps = [
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
-  ]
+config("public_configs") {
   include_dirs = [ "$proto_out_dir" ]
-  public_configs = [ ":service_types_proto_config" ]
-  sources = proto_types_codegen
-}
-
-source_set("service_types_proto_static") {
-  deps = [ ":service_types_proto_gen" ]
-  public_deps = [
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite_static",
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_static",
-  ]
-  include_dirs = [ "$proto_out_dir" ]
-  public_configs = [ ":service_types_proto_config" ]
-  sources = proto_types_codegen
 }
 
 #######################################################
-profiler_services_codegen = []
-foreach(proto, profiler_services_defines) {
-  name = get_path_info(proto, "name")
-  profiler_services_codegen += [
-    "$proto_out_dir/$name.pb.h",
-    "$proto_out_dir/$name.pb.cc",
-    "$proto_out_dir/$name.grpc.pb.h",
-    "$proto_out_dir/$name.grpc.pb.cc",
-  ]
-}
-
-action("profiler_services_proto_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
-  sources = profiler_services_defines
-  outputs = profiler_services_codegen
-  args = [
-    "$libc_dir_proto",
-    "$root_output_dir_proto",
-    "--plugin=protoc-gen-grpc=$grpc_cpp_plugin",
-    "--grpc_out",
-    "$proto_rel_out_dir",
-    "--cpp_out",
-    "$proto_rel_out_dir",
-    "--proto_path",
-    rebase_path(".", root_build_dir),
-  ]
-  args += rebase_path(sources, root_build_dir)
-  deps = [
-    "${OHOS_PROFILER_3RDPARTY_GRPC_DIR}:grpc_cpp_plugin(${host_toolchain})",
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})",
-  ]
-}
-
-config("profiler_services_proto_config") {
-  include_dirs = [ "$proto_out_dir" ]
-}
-
-source_set("profiler_services_proto") {
-  deps = [
-    ":profiler_services_proto_gen",
-    ":service_types_proto",
-  ]
-  public_deps = [
-    "${OHOS_PROFILER_3RDPARTY_GRPC_DIR}:grpc",
-    "${OHOS_PROFILER_3RDPARTY_GRPC_DIR}:grpcxx",
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
-  ]
-  include_dirs = [ "$proto_out_dir" ]
-  public_configs = [ ":profiler_services_proto_config" ]
-  sources = profiler_services_codegen
-}
+all_type_proto = [
+  "./common_types.proto",
+  "./profiler_service_types.proto",
+  "./plugin_service_types.proto",
+]
 
-#######################################################
-plugin_services_codegen = []
-foreach(proto, plugin_services_defines) {
+all_type_codegen = []
+all_type_codegen_standard = []
+all_type_codegen_reader = []
+all_type_codegen_all = []
+foreach(proto, all_type_proto) {
   name = get_path_info(proto, "name")
-  plugin_services_codegen += [
+  all_type_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
-    "$proto_out_dir/$name.ipc.h",
-    "$proto_out_dir/$name.ipc.cc",
   ]
+  all_type_codegen_reader += [ "$proto_out_dir/$name.pbreader.h" ]
 }
-
-action("plugin_services_proto_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
-  sources = plugin_services_defines
-  outputs = plugin_services_codegen
+all_type_codegen_all += all_type_codegen
+all_type_codegen_all += all_type_codegen_standard
+all_type_codegen_all += all_type_codegen_reader
+
+action("all_type_gen") {
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
+  sources = all_type_proto
+  outputs = all_type_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
-    "--plugin=protoc-gen-ipc=$ipc_cpp_plugin",
-    "--ipc_out",
-    "$proto_rel_out_dir",
+    "$proto_rel_out_dir",  # standard proto file destination path
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})",
-    "${OHOS_PROFILER_DIR}/device/services/ipc:protoc_gen_ipc(${host_toolchain})",
-  ]
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
 }
 
-config("plugin_services_proto_config") {
-  include_dirs = [ "$proto_out_dir" ]
-}
-
-source_set("plugin_services_proto") {
-  deps = [
-    ":plugin_services_proto_gen",
-    ":service_types_proto",
-  ]
+ohos_source_set("all_type_cpp_standard") {
+  deps = [ ":all_type_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
-    "${OHOS_PROFILER_DIR}/device/services/ipc:ipc",
-  ]
-  include_dirs = [
-    "$proto_out_dir",
-    "${OHOS_PROFILER_DIR}/device/services/ipc/include",
-  ]
-  public_configs = [ ":plugin_services_proto_config" ]
-  sources = plugin_services_codegen
-}
-
-source_set("plugin_services_proto_static") {
-  deps = [
-    ":plugin_services_proto_gen",
-    ":service_types_proto_static",
-  ]
-  public_deps = [
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite_static",
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_static",
-    "${OHOS_PROFILER_DIR}/device/services/ipc:ipc",
-  ]
-  include_dirs = [
-    "$proto_out_dir",
-    "${OHOS_PROFILER_DIR}/device/services/ipc/include",
-  ]
-  public_configs = [ ":plugin_services_proto_config" ]
-  sources = plugin_services_codegen
-}
-
-#######################################################
-source_set("proto_services_cpp") {
-  public_deps = [
-    ":plugin_services_proto",
-    ":profiler_services_proto",
-    ":service_types_proto",
   ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":public_configs" ]
+  sources = all_type_codegen_standard
+  subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
+  part_name = "${OHOS_PROFILER_PART_NAME}"
 }
diff --git a/trace_streamer/src/protos/services/common_types.proto b/trace_streamer/src/protos/services/common_types.proto
index 32559daf3b07a34bf9c80c78495bc41adf6e3652..6b7fa551f18301b36ef6b745ee55d54d69e18c3e 100755
--- a/trace_streamer/src/protos/services/common_types.proto
+++ b/trace_streamer/src/protos/services/common_types.proto
@@ -19,8 +19,9 @@ option java_package = "ohos.devtools.datasources.transport.grpc.service";
 message ProfilerPluginConfig {
     string name = 1;
     string plugin_sha256 = 2;
-    uint32 sample_interval = 3;
-    bytes  config_data = 4;
+    uint32 sample_interval = 3; // Polling plugin collection interval(ms)
+    bytes config_data = 4;
+    bool protobuf_serialize = 5; // data encoding method, true is protobuf, false is protoencoder
 }
 
 message ProfilerPluginState {
diff --git a/trace_streamer/src/protos/services/plugin_service_types.proto b/trace_streamer/src/protos/services/plugin_service_types.proto
index 3f54f23066364586a6a53543be59c258e8f98806..51aaa29f2f5728fb5beebd8d8cca63b5ba88dd2a 100755
--- a/trace_streamer/src/protos/services/plugin_service_types.proto
+++ b/trace_streamer/src/protos/services/plugin_service_types.proto
@@ -17,6 +17,13 @@ import "common_types.proto";
 
 // Message define for IPC interface, imported by plugin service proto file.
 // for RegisterPlugin API
+
+enum ResponseStatus {
+    STATUS_UNSPECIFIED = 0;
+    OK = 1;
+    ERR = 2;
+}
+
 message RegisterPluginRequest {
     uint32 request_id = 1;
     string path = 2;
@@ -24,10 +31,14 @@ message RegisterPluginRequest {
 
     string name = 4;
     uint32 buffer_size_hint = 5;
+
+    bool is_standalone_data = 6;
+    string out_file_name = 7;
+    string plugin_version = 8;
 }
 
 message RegisterPluginResponse {
-    uint32 status = 1;
+    ResponseStatus status = 1;
     uint32 plugin_id = 2;
 }
 
@@ -38,7 +49,7 @@ message UnregisterPluginRequest {
 }
 
 message UnregisterPluginResponse {
-    uint32 status = 1;
+    ResponseStatus status = 1;
 }
 
 // for GetCommand API
@@ -64,8 +75,12 @@ message StopSessionCmd {
     repeated uint32 plugin_ids = 1;
 }
 
+message RefreshSessionCmd {
+    repeated uint32 plugin_ids = 1;
+}
+
 message GetCommandResponse {
-    uint32 status = 1;
+    ResponseStatus status = 1;
     bool has_more = 2;
     uint32 command_id = 3;
     oneof command {
@@ -73,6 +88,7 @@ message GetCommandResponse {
         DestroySessionCmd destroy_session_cmd = 11;
         StartSessionCmd start_session_cmd = 12;
         StopSessionCmd stop_session_cmd = 13;
+        RefreshSessionCmd refresh_session_cmd = 14;
     }
 }
 
@@ -90,6 +106,7 @@ message PluginResult {
         BufferDescriptor buffer = 3;
     };
     ProfilerPluginState status = 10;
+    string out_file_name = 11; // The standalone plugin needs to add the output file name in the response of startSession
 }
 
 message NotifyResultRequest {
@@ -99,5 +116,5 @@ message NotifyResultRequest {
 }
 
 message NotifyResultResponse {
-    uint32 status = 1;
+    ResponseStatus status = 1;
 }
diff --git a/trace_streamer/src/protos/services/profiler_service_types.proto b/trace_streamer/src/protos/services/profiler_service_types.proto
index a557e620a7e79f61ed99c19f93e91293aa6d1e2b..8c0ae56c1c89d83f2c5fd2064e8f7ef46141b617 100755
--- a/trace_streamer/src/protos/services/profiler_service_types.proto
+++ b/trace_streamer/src/protos/services/profiler_service_types.proto
@@ -55,6 +55,9 @@ message ProfilerSessionConfig {
     uint32 result_max_size = 4; // for OFFLINE mode, result file max size in KB
     uint32 sample_duration = 5; // for OFFLINE mode, sample duration in ms
     uint32 keep_alive_time = 6; // if set to non-zero value, session will auto-destroyed after CreateSession in ms
+    bool discard_cache_data = 7; // if set true, session will stop immediately.(cache data will be lost)
+    bool split_file = 8; // if set true, will split result_file
+    uint32 single_file_max_size_mb = 9; // limit the maximum size of a single file
 }
 
 message CreateSessionRequest {
diff --git a/trace_streamer/src/protos/types/plugins/agent_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/agent_data/BUILD.gn
index bf26ed894ea66e3734ef961c4b683aef1fa1f7d5..4f9e90eed55d56c326cc423c77a7d3a7b2f35e51 100755
--- a/trace_streamer/src/protos/types/plugins/agent_data/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/agent_data/BUILD.gn
@@ -28,13 +28,21 @@ proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
 agent_data_codegen = []
+agent_data_codegen_standard = []
+agent_data_codegen_all = []
 foreach(proto, agent_sources) {
   name = get_path_info(proto, "name")
   agent_data_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
+  agent_data_codegen_standard += [
+    "$proto_out_dir/${name}_standard.pb.h",
+    "$proto_out_dir/${name}_standard.pb.cc",
+  ]
 }
+agent_data_codegen_all += agent_data_codegen
+agent_data_codegen_all += agent_data_codegen_standard
 
 config("agent_include_config") {
   include_dirs = [ "$proto_out_dir" ]
@@ -42,22 +50,28 @@ config("agent_include_config") {
 
 #######################################################
 action("agent_data_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = agent_sources
-  outputs = agent_data_codegen
+  outputs = agent_data_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
 }
 
-source_set("agent_data_cpp") {
+ohos_source_set("agent_data_cpp") {
   deps = [ ":agent_data_cpp_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
diff --git a/trace_streamer/src/protos/types/plugins/bytrace_plugin/BUILD.gn b/trace_streamer/src/protos/types/plugins/bytrace_plugin/BUILD.gn
index a7b85d48602cd61601d2ef4b1d483ed3a1d1c10a..ffdc82baaca423711c4496dc3f3f81124f3fd246 100755
--- a/trace_streamer/src/protos/types/plugins/bytrace_plugin/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/bytrace_plugin/BUILD.gn
@@ -19,39 +19,46 @@ bytrace_plugin_protos_defines = [ "./bytrace_plugin_config.proto" ]
 #######################################################
 proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
-print("proto_out_dir", proto_out_dir, proto_rel_out_dir)
 
 #######################################################
 bytrace_plugin_protos_codegen = []
+bytrace_plugin_protos_codegen_standard = []
+bytrace_plugin_protos_codegen_all = []
 foreach(proto, bytrace_plugin_protos_defines) {
   name = get_path_info(proto, "name")
   bytrace_plugin_protos_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
+  bytrace_plugin_protos_codegen_standard += [
+    "$proto_out_dir/${name}_standard.pb.h",
+    "$proto_out_dir/${name}_standard.pb.cc",
+  ]
 }
+bytrace_plugin_protos_codegen_all += bytrace_plugin_protos_codegen
+bytrace_plugin_protos_codegen_all += bytrace_plugin_protos_codegen_standard
 
 action("bytrace_plugin_protos_protoc") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = bytrace_plugin_protos_defines
-  outputs = bytrace_plugin_protos_codegen
+  outputs = bytrace_plugin_protos_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
 }
 
 config("bytrace_plugin_protos_config") {
   include_dirs = [ "$proto_out_dir" ]
 }
 
-source_set("bytrace_plugin_protos_cpp") {
+ohos_source_set("bytrace_plugin_protos_cpp") {
   deps = [ ":bytrace_plugin_protos_protoc" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
@@ -61,3 +68,14 @@ source_set("bytrace_plugin_protos_cpp") {
   public_configs = [ ":bytrace_plugin_protos_config" ]
   sources = bytrace_plugin_protos_codegen
 }
+
+ohos_source_set("bytrace_plugin_protos_cpp_standard") {
+  deps = [ ":bytrace_plugin_protos_protoc" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":bytrace_plugin_protos_config" ]
+  sources = bytrace_plugin_protos_codegen_standard
+}
diff --git a/trace_streamer/src/protos/types/plugins/cpu_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/cpu_data/BUILD.gn
index 2725868646f3d6803db23fba03a1fd52f95b2225..01da3bd29150697fa6192a4a2fc666499d6e2bf1 100755
--- a/trace_streamer/src/protos/types/plugins/cpu_data/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/cpu_data/BUILD.gn
@@ -24,13 +24,18 @@ proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
 cpu_data_codegen = []
+cpu_data_codegen_reader = []
+cpu_data_codegen_all = []
 foreach(proto, cpu_data_sources) {
   name = get_path_info(proto, "name")
   cpu_data_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
+  cpu_data_codegen_reader += [ "$proto_out_dir/$name.pbreader.h" ]
 }
+cpu_data_codegen_all += cpu_data_codegen
+cpu_data_codegen_all += cpu_data_codegen_reader
 
 config("cpu_include_config") {
   include_dirs = [ "$proto_out_dir" ]
@@ -38,22 +43,28 @@ config("cpu_include_config") {
 
 #######################################################
 action("cpu_data_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = cpu_data_sources
-  outputs = cpu_data_codegen
+  outputs = cpu_data_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",  # standard proto file destination path
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
 }
 
-source_set("cpu_data_cpp") {
+ohos_source_set("cpu_data_cpp") {
   deps = [ ":cpu_data_cpp_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
@@ -63,3 +74,10 @@ source_set("cpu_data_cpp") {
   public_configs = [ ":cpu_include_config" ]
   sources = cpu_data_codegen
 }
+
+ohos_source_set("cpu_data_encoder") {
+  deps = [ ":cpu_data_cpp_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":cpu_include_config" ]
+  sources = cpu_data_codegen_reader
+}
diff --git a/trace_streamer/src/protos/types/plugins/cpu_data/cpu_plugin_config.proto b/trace_streamer/src/protos/types/plugins/cpu_data/cpu_plugin_config.proto
index f3a730c9846020f333726a3630bf8d16151ebe6c..9b9c2a30d55ebb6e59a002049d48ae2bc31f48f3 100755
--- a/trace_streamer/src/protos/types/plugins/cpu_data/cpu_plugin_config.proto
+++ b/trace_streamer/src/protos/types/plugins/cpu_data/cpu_plugin_config.proto
@@ -20,4 +20,5 @@ option optimize_for = LITE_RUNTIME;
 // Cpu plug-in configuration, passed to plug-in by plug-in service.
 message CpuConfig {
     int32 pid = 1;
+    bool report_process_info = 2;
 }
diff --git a/trace_streamer/src/protos/types/plugins/diskio_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/diskio_data/BUILD.gn
index b8011c2bbb269dc0153cc24af58c43a6e922a95d..66df231b2040ed8a08dac16382d3f35ed61f17d6 100755
--- a/trace_streamer/src/protos/types/plugins/diskio_data/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/diskio_data/BUILD.gn
@@ -24,13 +24,18 @@ proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
 diskio_data_codegen = []
+diskio_data_codegen_reader = []
+diskio_data_codegen_all = []
 foreach(proto, diskio_data_sources) {
   name = get_path_info(proto, "name")
   diskio_data_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
+  diskio_data_codegen_reader += [ "$proto_out_dir/$name.pbreader.h" ]
 }
+diskio_data_codegen_all += diskio_data_codegen
+diskio_data_codegen_all += diskio_data_codegen_reader
 
 config("diskio_include_config") {
   include_dirs = [ "$proto_out_dir" ]
@@ -38,22 +43,28 @@ config("diskio_include_config") {
 
 #######################################################
 action("diskio_data_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = diskio_data_sources
-  outputs = diskio_data_codegen
+  outputs = diskio_data_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
 }
 
-source_set("diskio_data_cpp") {
+ohos_source_set("diskio_data_cpp") {
   deps = [ ":diskio_data_cpp_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
@@ -63,3 +74,10 @@ source_set("diskio_data_cpp") {
   public_configs = [ ":diskio_include_config" ]
   sources = diskio_data_codegen
 }
+
+ohos_source_set("diskio_data_encoder") {
+  deps = [ ":diskio_data_cpp_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":diskio_include_config" ]
+  sources = diskio_data_codegen_reader
+}
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/ftrace_data/default/BUILD.gn
similarity index 57%
rename from trace_streamer/src/protos/types/plugins/ftrace_data/BUILD.gn
rename to trace_streamer/src/protos/types/plugins/ftrace_data/default/BUILD.gn
index 642ccb83faa19bde9acbedb9efd1733f15baa848..b22b0394a7dd10baa22e2977d28b864b36bdbcaf 100755
--- a/trace_streamer/src/protos/types/plugins/ftrace_data/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/BUILD.gn
@@ -12,56 +12,74 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("../../../protos.gni")
+import("../../../../protos.gni")
 import("autogenerated.gni")
 
-ftrace_data_sources = auto_generated_ftrace_proto_sources + [
-                        "trace_plugin_config.proto",
-                        "trace_plugin_result.proto",
-                      ]
+all_proto = auto_generated_ftrace_proto_sources + [
+              "trace_plugin_config.proto",
+              "trace_plugin_result.proto",
+            ]
 
 #######################################################
 proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
+ftrace_data_proto = all_proto
 ftrace_data_codegen = []
-foreach(proto, ftrace_data_sources) {
+ftrace_data_codegen_reader = []
+foreach(proto, ftrace_data_proto) {
   dir = get_path_info(proto, "dir")
   name = get_path_info(proto, "name")
   ftrace_data_codegen += [
     "$proto_out_dir/$dir/$name.pb.h",
     "$proto_out_dir/$dir/$name.pb.cc",
   ]
+  ftrace_data_codegen_reader += [ "$proto_out_dir/$dir/${name}.pbreader.h" ]
 }
 
-config("ftrace_data_include_config") {
-  include_dirs = [ "$proto_out_dir" ]
-}
+all_proto_codegen = ftrace_data_codegen
+all_proto_codegen += ftrace_data_codegen_reader
 
-#######################################################
-action("ftrace_data_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
-  sources = ftrace_data_sources
-  outputs = ftrace_data_codegen
+action("all_proto_gen") {
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
+  sources = all_proto
+  outputs = all_proto_codegen
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
+}
+
+config("public_configs") {
+  include_dirs = [ "$proto_out_dir" ]
 }
 
-source_set("ftrace_data_cpp") {
-  deps = [ ":ftrace_data_cpp_gen" ]
+ohos_source_set("ftrace_data_cpp") {
+  deps = [ ":all_proto_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
   ]
   include_dirs = [ "$proto_out_dir" ]
-  public_configs = [ ":ftrace_data_include_config" ]
+  public_configs = [ ":public_configs" ]
   sources = ftrace_data_codegen
 }
+
+ohos_source_set("ftrace_data_encoder") {
+  deps = [ ":all_proto_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":public_configs" ]
+  sources = ftrace_data_codegen_reader
+}
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/autogenerated.gni b/trace_streamer/src/protos/types/plugins/ftrace_data/default/autogenerated.gni
new file mode 100644
index 0000000000000000000000000000000000000000..0e98ef48f7c3d7977718f04196d250a09a896f83
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/autogenerated.gni
@@ -0,0 +1,52 @@
+# THIS FILE IS GENERATE BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+auto_generated_ftrace_proto_sources = [
+  "binder.proto",
+  "block.proto",
+  "cgroup.proto",
+  "clk.proto",
+  "compaction.proto",
+  "cpuhp.proto",
+  "dma_fence.proto",
+  "ext4.proto",
+  "f2fs.proto",
+  "filelock.proto",
+  "filemap.proto",
+  "ftrace.proto",
+  "ftrace_event.proto",
+  "gpio.proto",
+  "gpu_mem.proto",
+  "i2c.proto",
+  "ipi.proto",
+  "irq.proto",
+  "kmem.proto",
+  "mmc.proto",
+  "net.proto",
+  "oom.proto",
+  "pagemap.proto",
+  "power.proto",
+  "printk.proto",
+  "raw_syscalls.proto",
+  "rcu.proto",
+  "regulator.proto",
+  "sched.proto",
+  "signal.proto",
+  "sunrpc.proto",
+  "task.proto",
+  "timer.proto",
+  "v4l2.proto",
+  "vmscan.proto",
+  "workqueue.proto",
+  "writeback.proto",
+]
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/binder.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/binder.proto
new file mode 100755
index 0000000000000000000000000000000000000000..f1d0acd59d8986e9b5606fa3684bdebc76057726
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/binder.proto
@@ -0,0 +1,216 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: binder
+// /sys/kernel/debug/tracing/events/binder/binder_alloc_lru_end/format
+message BinderAllocLruEndFormat {
+    int32 proc = 1;
+    uint64 page_index = 2;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_alloc_lru_start/format
+message BinderAllocLruStartFormat {
+    int32 proc = 1;
+    uint64 page_index = 2;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_alloc_page_end/format
+message BinderAllocPageEndFormat {
+    int32 proc = 1;
+    uint64 page_index = 2;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_alloc_page_start/format
+message BinderAllocPageStartFormat {
+    int32 proc = 1;
+    uint64 page_index = 2;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_command/format
+message BinderCommandFormat {
+    uint32 cmd = 1;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_free_lru_end/format
+message BinderFreeLruEndFormat {
+    int32 proc = 1;
+    uint64 page_index = 2;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_free_lru_start/format
+message BinderFreeLruStartFormat {
+    int32 proc = 1;
+    uint64 page_index = 2;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_ioctl/format
+message BinderIoctlFormat {
+    uint32 cmd = 1;
+    uint64 arg = 2;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_ioctl_done/format
+message BinderIoctlDoneFormat {
+    int32 ret = 1;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_lock/format
+message BinderLockFormat {
+    string tag = 1;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_locked/format
+message BinderLockedFormat {
+    string tag = 1;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_read_done/format
+message BinderReadDoneFormat {
+    int32 ret = 1;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_return/format
+message BinderReturnFormat {
+    uint32 cmd = 1;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_transaction/format
+message BinderTransactionFormat {
+    int32 debug_id = 1;
+    int32 target_node = 2;
+    int32 to_proc = 3;
+    int32 to_thread = 4;
+    int32 reply = 5;
+    uint32 code = 6;
+    uint32 flags = 7;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_transaction_alloc_buf/format
+message BinderTransactionAllocBufFormat {
+    int32 debug_id = 1;
+    uint64 data_size = 2;
+    uint64 offsets_size = 3;
+    uint64 extra_buffers_size = 4;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_transaction_buffer_release/format
+message BinderTransactionBufferReleaseFormat {
+    int32 debug_id = 1;
+    uint64 data_size = 2;
+    uint64 offsets_size = 3;
+    uint64 extra_buffers_size = 4;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_transaction_failed_buffer_release/format
+message BinderTransactionFailedBufferReleaseFormat {
+    int32 debug_id = 1;
+    uint64 data_size = 2;
+    uint64 offsets_size = 3;
+    uint64 extra_buffers_size = 4;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_transaction_fd/format
+message BinderTransactionFdFormat {
+    int32 debug_id = 1;
+    int32 src_fd = 2;
+    int32 dest_fd = 3;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_transaction_node_to_ref/format
+message BinderTransactionNodeToRefFormat {
+    int32 debug_id = 1;
+    int32 node_debug_id = 2;
+    uint64 node_ptr = 3;
+    int32 ref_debug_id = 4;
+    uint32 ref_desc = 5;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_transaction_received/format
+message BinderTransactionReceivedFormat {
+    int32 debug_id = 1;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_transaction_ref_to_node/format
+message BinderTransactionRefToNodeFormat {
+    int32 debug_id = 1;
+    int32 ref_debug_id = 2;
+    uint32 ref_desc = 3;
+    int32 node_debug_id = 4;
+    uint64 node_ptr = 5;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_transaction_ref_to_ref/format
+message BinderTransactionRefToRefFormat {
+    int32 debug_id = 1;
+    int32 node_debug_id = 2;
+    int32 src_ref_debug_id = 3;
+    uint32 src_ref_desc = 4;
+    int32 dest_ref_debug_id = 5;
+    uint32 dest_ref_desc = 6;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_unlock/format
+message BinderUnlockFormat {
+    string tag = 1;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_unmap_kernel_end/format
+message BinderUnmapKernelEndFormat {
+    int32 proc = 1;
+    uint64 page_index = 2;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_unmap_kernel_start/format
+message BinderUnmapKernelStartFormat {
+    int32 proc = 1;
+    uint64 page_index = 2;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_unmap_user_end/format
+message BinderUnmapUserEndFormat {
+    int32 proc = 1;
+    uint64 page_index = 2;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_unmap_user_start/format
+message BinderUnmapUserStartFormat {
+    int32 proc = 1;
+    uint64 page_index = 2;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_update_page_range/format
+message BinderUpdatePageRangeFormat {
+    int32 proc = 1;
+    uint32 allocate = 2;
+    uint64 offset = 3;
+    uint64 size = 4;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_wait_for_work/format
+message BinderWaitForWorkFormat {
+    uint32 proc_work = 1;
+    uint32 transaction_stack = 2;
+    uint32 thread_todo = 3;
+}
+
+// /sys/kernel/debug/tracing/events/binder/binder_write_done/format
+message BinderWriteDoneFormat {
+    int32 ret = 1;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/block.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/block.proto
new file mode 100755
index 0000000000000000000000000000000000000000..5975c0e3ff1d4a4e6bd2cdd26e9ca4bba2409d1a
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/block.proto
@@ -0,0 +1,179 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: block
+// /sys/kernel/debug/tracing/events/block/block_bio_backmerge/format
+message BlockBioBackmergeFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint32 nr_sector = 3;
+    string rwbs = 4;
+    string comm = 5;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_bio_bounce/format
+message BlockBioBounceFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint32 nr_sector = 3;
+    string rwbs = 4;
+    string comm = 5;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_bio_complete/format
+message BlockBioCompleteFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint32 nr_sector = 3;
+    int32 error = 4;
+    string rwbs = 5;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_bio_frontmerge/format
+message BlockBioFrontmergeFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint32 nr_sector = 3;
+    string rwbs = 4;
+    string comm = 5;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_bio_queue/format
+message BlockBioQueueFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint32 nr_sector = 3;
+    string rwbs = 4;
+    string comm = 5;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_bio_remap/format
+message BlockBioRemapFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint32 nr_sector = 3;
+    uint64 old_dev = 4;
+    uint64 old_sector = 5;
+    string rwbs = 6;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_dirty_buffer/format
+message BlockDirtyBufferFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint64 size = 3;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_getrq/format
+message BlockGetrqFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint32 nr_sector = 3;
+    string rwbs = 4;
+    string comm = 5;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_plug/format
+message BlockPlugFormat {
+    string comm = 1;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_rq_complete/format
+message BlockRqCompleteFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint32 nr_sector = 3;
+    int32 error = 4;
+    string rwbs = 5;
+    string cmd = 6;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_rq_insert/format
+message BlockRqInsertFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint32 nr_sector = 3;
+    uint32 bytes = 4;
+    string rwbs = 5;
+    string comm = 6;
+    string cmd = 7;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_rq_issue/format
+message BlockRqIssueFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint32 nr_sector = 3;
+    uint32 bytes = 4;
+    string rwbs = 5;
+    string comm = 6;
+    string cmd = 7;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_rq_remap/format
+message BlockRqRemapFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint32 nr_sector = 3;
+    uint64 old_dev = 4;
+    uint64 old_sector = 5;
+    uint32 nr_bios = 6;
+    string rwbs = 7;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_rq_requeue/format
+message BlockRqRequeueFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint32 nr_sector = 3;
+    string rwbs = 4;
+    string cmd = 5;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_sleeprq/format
+message BlockSleeprqFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint32 nr_sector = 3;
+    string rwbs = 4;
+    string comm = 5;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_split/format
+message BlockSplitFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint64 new_sector = 3;
+    string rwbs = 4;
+    string comm = 5;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_touch_buffer/format
+message BlockTouchBufferFormat {
+    uint64 dev = 1;
+    uint64 sector = 2;
+    uint64 size = 3;
+}
+
+// /sys/kernel/debug/tracing/events/block/block_unplug/format
+message BlockUnplugFormat {
+    int32 nr_rq = 1;
+    string comm = 2;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/cgroup.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/cgroup.proto
new file mode 100644
index 0000000000000000000000000000000000000000..e3f9a86b52977a0af8b107e89a3f8b0ab23f3efd
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/cgroup.proto
@@ -0,0 +1,126 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: cgroup
+// /sys/kernel/debug/tracing/events/cgroup/cgroup_attach_task/format
+message CgroupAttachTaskFormat {
+    int32 dst_root = 1;
+    int32 dst_id = 2;
+    int32 dst_level = 3;
+    int32 pid = 4;
+    string dst_path = 5;
+    string comm = 6;
+}
+
+// /sys/kernel/debug/tracing/events/cgroup/cgroup_destroy_root/format
+message CgroupDestroyRootFormat {
+    int32 root = 1;
+    uint32 ss_mask = 2;
+    string name = 3;
+}
+
+// /sys/kernel/debug/tracing/events/cgroup/cgroup_freeze/format
+message CgroupFreezeFormat {
+    int32 root = 1;
+    int32 id = 2;
+    int32 level = 3;
+    string path = 4;
+}
+
+// /sys/kernel/debug/tracing/events/cgroup/cgroup_mkdir/format
+message CgroupMkdirFormat {
+    int32 root = 1;
+    int32 id = 2;
+    int32 level = 3;
+    string path = 4;
+}
+
+// /sys/kernel/debug/tracing/events/cgroup/cgroup_notify_frozen/format
+message CgroupNotifyFrozenFormat {
+    int32 root = 1;
+    int32 id = 2;
+    int32 level = 3;
+    string path = 4;
+    int32 val = 5;
+}
+
+// /sys/kernel/debug/tracing/events/cgroup/cgroup_notify_populated/format
+message CgroupNotifyPopulatedFormat {
+    int32 root = 1;
+    int32 id = 2;
+    int32 level = 3;
+    string path = 4;
+    int32 val = 5;
+}
+
+// /sys/kernel/debug/tracing/events/cgroup/cgroup_release/format
+message CgroupReleaseFormat {
+    int32 root = 1;
+    int32 id = 2;
+    int32 level = 3;
+    string path = 4;
+}
+
+// /sys/kernel/debug/tracing/events/cgroup/cgroup_remount/format
+message CgroupRemountFormat {
+    int32 root = 1;
+    uint32 ss_mask = 2;
+    string name = 3;
+}
+
+// /sys/kernel/debug/tracing/events/cgroup/cgroup_rename/format
+message CgroupRenameFormat {
+    int32 root = 1;
+    int32 id = 2;
+    int32 level = 3;
+    string path = 4;
+}
+
+// /sys/kernel/debug/tracing/events/cgroup/cgroup_rmdir/format
+message CgroupRmdirFormat {
+    int32 root = 1;
+    int32 id = 2;
+    int32 level = 3;
+    string path = 4;
+}
+
+// /sys/kernel/debug/tracing/events/cgroup/cgroup_setup_root/format
+message CgroupSetupRootFormat {
+    int32 root = 1;
+    uint32 ss_mask = 2;
+    string name = 3;
+}
+
+// /sys/kernel/debug/tracing/events/cgroup/cgroup_transfer_tasks/format
+message CgroupTransferTasksFormat {
+    int32 dst_root = 1;
+    int32 dst_id = 2;
+    int32 dst_level = 3;
+    int32 pid = 4;
+    string dst_path = 5;
+    string comm = 6;
+}
+
+// /sys/kernel/debug/tracing/events/cgroup/cgroup_unfreeze/format
+message CgroupUnfreezeFormat {
+    int32 root = 1;
+    int32 id = 2;
+    int32 level = 3;
+    string path = 4;
+}
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/clk.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/clk.proto
new file mode 100755
index 0000000000000000000000000000000000000000..0f74b25fb2eef0935707786bcf3402d169dd55f8
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/clk.proto
@@ -0,0 +1,96 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: clk
+// /sys/kernel/debug/tracing/events/clk/clk_disable/format
+message ClkDisableFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/clk/clk_disable_complete/format
+message ClkDisableCompleteFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/clk/clk_enable/format
+message ClkEnableFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/clk/clk_enable_complete/format
+message ClkEnableCompleteFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/clk/clk_prepare/format
+message ClkPrepareFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/clk/clk_prepare_complete/format
+message ClkPrepareCompleteFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/clk/clk_set_parent/format
+message ClkSetParentFormat {
+    string name = 1;
+    string pname = 2;
+}
+
+// /sys/kernel/debug/tracing/events/clk/clk_set_parent_complete/format
+message ClkSetParentCompleteFormat {
+    string name = 1;
+    string pname = 2;
+}
+
+// /sys/kernel/debug/tracing/events/clk/clk_set_phase/format
+message ClkSetPhaseFormat {
+    string name = 1;
+    int32 phase = 2;
+}
+
+// /sys/kernel/debug/tracing/events/clk/clk_set_phase_complete/format
+message ClkSetPhaseCompleteFormat {
+    string name = 1;
+    int32 phase = 2;
+}
+
+// /sys/kernel/debug/tracing/events/clk/clk_set_rate/format
+message ClkSetRateFormat {
+    string name = 1;
+    uint64 rate = 2;
+}
+
+// /sys/kernel/debug/tracing/events/clk/clk_set_rate_complete/format
+message ClkSetRateCompleteFormat {
+    string name = 1;
+    uint64 rate = 2;
+}
+
+// /sys/kernel/debug/tracing/events/clk/clk_unprepare/format
+message ClkUnprepareFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/clk/clk_unprepare_complete/format
+message ClkUnprepareCompleteFormat {
+    string name = 1;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/compaction.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/compaction.proto
new file mode 100755
index 0000000000000000000000000000000000000000..2df331f2893674fb8d8d65163e25a9efba26e3e2
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/compaction.proto
@@ -0,0 +1,114 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: compaction
+// /sys/kernel/debug/tracing/events/compaction/mm_compaction_begin/format
+message MmCompactionBeginFormat {
+    uint64 zone_start = 1;
+    uint64 migrate_pfn = 2;
+    uint64 free_pfn = 3;
+    uint64 zone_end = 4;
+    uint32 sync = 5;
+}
+
+// /sys/kernel/debug/tracing/events/compaction/mm_compaction_defer_compaction/format
+message MmCompactionDeferCompactionFormat {
+    int32 nid = 1;
+    uint32 idx = 2;
+    int32 order = 3;
+    uint32 considered = 4;
+    uint32 defer_shift = 5;
+    int32 order_failed = 6;
+}
+
+// /sys/kernel/debug/tracing/events/compaction/mm_compaction_defer_reset/format
+message MmCompactionDeferResetFormat {
+    int32 nid = 1;
+    uint32 idx = 2;
+    int32 order = 3;
+    uint32 considered = 4;
+    uint32 defer_shift = 5;
+    int32 order_failed = 6;
+}
+
+// /sys/kernel/debug/tracing/events/compaction/mm_compaction_deferred/format
+message MmCompactionDeferredFormat {
+    int32 nid = 1;
+    uint32 idx = 2;
+    int32 order = 3;
+    uint32 considered = 4;
+    uint32 defer_shift = 5;
+    int32 order_failed = 6;
+}
+
+// /sys/kernel/debug/tracing/events/compaction/mm_compaction_end/format
+message MmCompactionEndFormat {
+    uint64 zone_start = 1;
+    uint64 migrate_pfn = 2;
+    uint64 free_pfn = 3;
+    uint64 zone_end = 4;
+    uint32 sync = 5;
+    int32 status = 6;
+}
+
+// /sys/kernel/debug/tracing/events/compaction/mm_compaction_finished/format
+message MmCompactionFinishedFormat {
+    int32 nid = 1;
+    uint32 idx = 2;
+    int32 order = 3;
+    int32 ret = 4;
+}
+
+// /sys/kernel/debug/tracing/events/compaction/mm_compaction_isolate_freepages/format
+message MmCompactionIsolateFreepagesFormat {
+    uint64 start_pfn = 1;
+    uint64 end_pfn = 2;
+    uint64 nr_scanned = 3;
+    uint64 nr_taken = 4;
+}
+
+// /sys/kernel/debug/tracing/events/compaction/mm_compaction_isolate_migratepages/format
+message MmCompactionIsolateMigratepagesFormat {
+    uint64 start_pfn = 1;
+    uint64 end_pfn = 2;
+    uint64 nr_scanned = 3;
+    uint64 nr_taken = 4;
+}
+
+// /sys/kernel/debug/tracing/events/compaction/mm_compaction_migratepages/format
+message MmCompactionMigratepagesFormat {
+    uint64 nr_migrated = 1;
+    uint64 nr_failed = 2;
+}
+
+// /sys/kernel/debug/tracing/events/compaction/mm_compaction_suitable/format
+message MmCompactionSuitableFormat {
+    int32 nid = 1;
+    uint32 idx = 2;
+    int32 order = 3;
+    int32 ret = 4;
+}
+
+// /sys/kernel/debug/tracing/events/compaction/mm_compaction_try_to_compact_pages/format
+message MmCompactionTryToCompactPagesFormat {
+    int32 order = 1;
+    uint32 gfp_mask = 2;
+    int32 prio = 3;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/cpuhp.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/cpuhp.proto
new file mode 100755
index 0000000000000000000000000000000000000000..db805bc33e41cdc383846b1f81ab9dd358456cc5
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/cpuhp.proto
@@ -0,0 +1,44 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: cpuhp
+// /sys/kernel/debug/tracing/events/cpuhp/cpuhp_enter/format
+message CpuhpEnterFormat {
+    uint32 cpu = 1;
+    int32 target = 2;
+    int32 idx = 3;
+    uint64 fun = 4;
+}
+
+// /sys/kernel/debug/tracing/events/cpuhp/cpuhp_exit/format
+message CpuhpExitFormat {
+    uint32 cpu = 1;
+    int32 state = 2;
+    int32 idx = 3;
+    int32 ret = 4;
+}
+
+// /sys/kernel/debug/tracing/events/cpuhp/cpuhp_multi_enter/format
+message CpuhpMultiEnterFormat {
+    uint32 cpu = 1;
+    int32 target = 2;
+    int32 idx = 3;
+    uint64 fun = 4;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/dma_fence.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/dma_fence.proto
new file mode 100755
index 0000000000000000000000000000000000000000..74b511b8f5be7f6f77db7b9dfd351393dc38c53e
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/dma_fence.proto
@@ -0,0 +1,76 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: dma_fence
+// /sys/kernel/debug/tracing/events/dma_fence/dma_fence_destroy/format
+message DmaFenceDestroyFormat {
+    string driver = 1;
+    string timeline = 2;
+    uint32 context = 3;
+    uint32 seqno = 4;
+}
+
+// /sys/kernel/debug/tracing/events/dma_fence/dma_fence_emit/format
+message DmaFenceEmitFormat {
+    string driver = 1;
+    string timeline = 2;
+    uint32 context = 3;
+    uint32 seqno = 4;
+}
+
+// /sys/kernel/debug/tracing/events/dma_fence/dma_fence_enable_signal/format
+message DmaFenceEnableSignalFormat {
+    string driver = 1;
+    string timeline = 2;
+    uint32 context = 3;
+    uint32 seqno = 4;
+}
+
+// /sys/kernel/debug/tracing/events/dma_fence/dma_fence_init/format
+message DmaFenceInitFormat {
+    string driver = 1;
+    string timeline = 2;
+    uint32 context = 3;
+    uint32 seqno = 4;
+}
+
+// /sys/kernel/debug/tracing/events/dma_fence/dma_fence_signaled/format
+message DmaFenceSignaledFormat {
+    string driver = 1;
+    string timeline = 2;
+    uint32 context = 3;
+    uint32 seqno = 4;
+}
+
+// /sys/kernel/debug/tracing/events/dma_fence/dma_fence_wait_end/format
+message DmaFenceWaitEndFormat {
+    string driver = 1;
+    string timeline = 2;
+    uint32 context = 3;
+    uint32 seqno = 4;
+}
+
+// /sys/kernel/debug/tracing/events/dma_fence/dma_fence_wait_start/format
+message DmaFenceWaitStartFormat {
+    string driver = 1;
+    string timeline = 2;
+    uint32 context = 3;
+    uint32 seqno = 4;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/ext4.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/ext4.proto
new file mode 100755
index 0000000000000000000000000000000000000000..d66f4baaebf2e2bba8ee3428377e76ee502a1e02
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/ext4.proto
@@ -0,0 +1,872 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: ext4
+// /sys/kernel/debug/tracing/events/ext4/ext4_alloc_da_blocks/format
+message Ext4AllocDaBlocksFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 data_blocks = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_allocate_blocks/format
+message Ext4AllocateBlocksFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 block = 3;
+    uint32 len = 4;
+    uint32 logical = 5;
+    uint32 lleft = 6;
+    uint32 lright = 7;
+    uint64 goal = 8;
+    uint64 pleft = 9;
+    uint64 pright = 10;
+    uint32 flags = 11;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_allocate_inode/format
+message Ext4AllocateInodeFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 dir = 3;
+    uint32 mode = 4;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_begin_ordered_truncate/format
+message Ext4BeginOrderedTruncateFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 new_size = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_collapse_range/format
+message Ext4CollapseRangeFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 offset = 3;
+    uint64 len = 4;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_da_release_space/format
+message Ext4DaReleaseSpaceFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 i_blocks = 3;
+    int32 freed_blocks = 4;
+    int32 reserved_data_blocks = 5;
+    uint32 mode = 6;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_da_reserve_space/format
+message Ext4DaReserveSpaceFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 i_blocks = 3;
+    int32 reserved_data_blocks = 4;
+    uint32 mode = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_da_update_reserve_space/format
+message Ext4DaUpdateReserveSpaceFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 i_blocks = 3;
+    int32 used_blocks = 4;
+    int32 reserved_data_blocks = 5;
+    int32 quota_claim = 6;
+    uint32 mode = 7;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_da_write_begin/format
+message Ext4DaWriteBeginFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pos = 3;
+    uint32 len = 4;
+    uint32 flags = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_da_write_end/format
+message Ext4DaWriteEndFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pos = 3;
+    uint32 len = 4;
+    uint32 copied = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_da_write_pages/format
+message Ext4DaWritePagesFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 first_page = 3;
+    uint64 nr_to_write = 4;
+    int32 sync_mode = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_da_write_pages_extent/format
+message Ext4DaWritePagesExtentFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 lblk = 3;
+    uint32 len = 4;
+    uint32 flags = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_direct_IO_enter/format
+message Ext4DirectIoEnterFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pos = 3;
+    uint64 len = 4;
+    int32 rw = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_direct_IO_exit/format
+message Ext4DirectIoExitFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pos = 3;
+    uint64 len = 4;
+    int32 rw = 5;
+    int32 ret = 6;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_discard_blocks/format
+message Ext4DiscardBlocksFormat {
+    uint64 dev = 1;
+    uint64 blk = 2;
+    uint64 count = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_discard_preallocations/format
+message Ext4DiscardPreallocationsFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_drop_inode/format
+message Ext4DropInodeFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    int32 drop = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_es_cache_extent/format
+message Ext4EsCacheExtentFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 lblk = 3;
+    uint32 len = 4;
+    uint64 pblk = 5;
+    uint32 status = 6;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_es_find_delayed_extent_range_enter/format
+message Ext4EsFindDelayedExtentRangeEnterFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 lblk = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_es_find_delayed_extent_range_exit/format
+message Ext4EsFindDelayedExtentRangeExitFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 lblk = 3;
+    uint32 len = 4;
+    uint64 pblk = 5;
+    uint32 status = 6;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_es_insert_extent/format
+message Ext4EsInsertExtentFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 lblk = 3;
+    uint32 len = 4;
+    uint64 pblk = 5;
+    uint32 status = 6;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_es_lookup_extent_enter/format
+message Ext4EsLookupExtentEnterFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 lblk = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_es_lookup_extent_exit/format
+message Ext4EsLookupExtentExitFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 lblk = 3;
+    uint32 len = 4;
+    uint64 pblk = 5;
+    uint32 status = 6;
+    int32 found = 7;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_es_remove_extent/format
+message Ext4EsRemoveExtentFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 lblk = 3;
+    uint64 len = 4;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_es_shrink/format
+message Ext4EsShrinkFormat {
+    uint64 dev = 1;
+    int32 nr_shrunk = 2;
+    uint64 scan_time = 3;
+    int32 nr_skipped = 4;
+    int32 retried = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_es_shrink_count/format
+message Ext4EsShrinkCountFormat {
+    uint64 dev = 1;
+    int32 nr_to_scan = 2;
+    int32 cache_cnt = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_es_shrink_scan_enter/format
+message Ext4EsShrinkScanEnterFormat {
+    uint64 dev = 1;
+    int32 nr_to_scan = 2;
+    int32 cache_cnt = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_es_shrink_scan_exit/format
+message Ext4EsShrinkScanExitFormat {
+    uint64 dev = 1;
+    int32 nr_shrunk = 2;
+    int32 cache_cnt = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_evict_inode/format
+message Ext4EvictInodeFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    int32 nlink = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ext_convert_to_initialized_enter/format
+message Ext4ExtConvertToInitializedEnterFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 m_lblk = 3;
+    uint32 m_len = 4;
+    uint32 u_lblk = 5;
+    uint32 u_len = 6;
+    uint64 u_pblk = 7;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ext_convert_to_initialized_fastpath/format
+message Ext4ExtConvertToInitializedFastpathFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 m_lblk = 3;
+    uint32 m_len = 4;
+    uint32 u_lblk = 5;
+    uint32 u_len = 6;
+    uint64 u_pblk = 7;
+    uint32 i_lblk = 8;
+    uint32 i_len = 9;
+    uint64 i_pblk = 10;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ext_handle_unwritten_extents/format
+message Ext4ExtHandleUnwrittenExtentsFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    int32 flags = 3;
+    uint32 lblk = 4;
+    uint64 pblk = 5;
+    uint32 len = 6;
+    uint32 allocated = 7;
+    uint64 newblk = 8;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ext_in_cache/format
+message Ext4ExtInCacheFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 lblk = 3;
+    int32 ret = 4;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ext_load_extent/format
+message Ext4ExtLoadExtentFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pblk = 3;
+    uint32 lblk = 4;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ext_map_blocks_enter/format
+message Ext4ExtMapBlocksEnterFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 lblk = 3;
+    uint32 len = 4;
+    uint32 flags = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ext_map_blocks_exit/format
+message Ext4ExtMapBlocksExitFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 flags = 3;
+    uint64 pblk = 4;
+    uint32 lblk = 5;
+    uint32 len = 6;
+    uint32 mflags = 7;
+    int32 ret = 8;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ext_put_in_cache/format
+message Ext4ExtPutInCacheFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 lblk = 3;
+    uint32 len = 4;
+    uint64 start = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ext_remove_space/format
+message Ext4ExtRemoveSpaceFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 start = 3;
+    uint32 end = 4;
+    int32 depth = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ext_remove_space_done/format
+message Ext4ExtRemoveSpaceDoneFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 start = 3;
+    uint32 end = 4;
+    int32 depth = 5;
+    uint64 partial = 6;
+    uint32 eh_entries = 7;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ext_rm_idx/format
+message Ext4ExtRmIdxFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pblk = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ext_rm_leaf/format
+message Ext4ExtRmLeafFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 partial = 3;
+    uint32 start = 4;
+    uint32 ee_lblk = 5;
+    uint64 ee_pblk = 6;
+    int32 ee_len = 7;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ext_show_extent/format
+message Ext4ExtShowExtentFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pblk = 3;
+    uint32 lblk = 4;
+    uint32 len = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_fallocate_enter/format
+message Ext4FallocateEnterFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 offset = 3;
+    uint64 len = 4;
+    int32 mode = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_fallocate_exit/format
+message Ext4FallocateExitFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pos = 3;
+    uint32 blocks = 4;
+    int32 ret = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_find_delalloc_range/format
+message Ext4FindDelallocRangeFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 from = 3;
+    uint32 to = 4;
+    int32 reverse = 5;
+    int32 found = 6;
+    uint32 found_blk = 7;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_forget/format
+message Ext4ForgetFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 block = 3;
+    int32 is_metadata = 4;
+    uint32 mode = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_free_blocks/format
+message Ext4FreeBlocksFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 block = 3;
+    uint64 count = 4;
+    int32 flags = 5;
+    uint32 mode = 6;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_free_inode/format
+message Ext4FreeInodeFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 uid = 3;
+    uint32 gid = 4;
+    uint64 blocks = 5;
+    uint32 mode = 6;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_get_implied_cluster_alloc_exit/format
+message Ext4GetImpliedClusterAllocExitFormat {
+    uint64 dev = 1;
+    uint32 flags = 2;
+    uint32 lblk = 3;
+    uint64 pblk = 4;
+    uint32 len = 5;
+    int32 ret = 6;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_get_reserved_cluster_alloc/format
+message Ext4GetReservedClusterAllocFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 lblk = 3;
+    uint32 len = 4;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ind_map_blocks_enter/format
+message Ext4IndMapBlocksEnterFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 lblk = 3;
+    uint32 len = 4;
+    uint32 flags = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_ind_map_blocks_exit/format
+message Ext4IndMapBlocksExitFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 flags = 3;
+    uint64 pblk = 4;
+    uint32 lblk = 5;
+    uint32 len = 6;
+    uint32 mflags = 7;
+    int32 ret = 8;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_insert_range/format
+message Ext4InsertRangeFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 offset = 3;
+    uint64 len = 4;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_invalidatepage/format
+message Ext4InvalidatepageFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 index = 3;
+    uint32 offset = 4;
+    uint32 length = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_journal_start/format
+message Ext4JournalStartFormat {
+    uint64 dev = 1;
+    uint64 ip = 2;
+    int32 blocks = 3;
+    int32 rsv_blocks = 4;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_journal_start_reserved/format
+message Ext4JournalStartReservedFormat {
+    uint64 dev = 1;
+    uint64 ip = 2;
+    int32 blocks = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_journalled_invalidatepage/format
+message Ext4JournalledInvalidatepageFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 index = 3;
+    uint32 offset = 4;
+    uint32 length = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_journalled_write_end/format
+message Ext4JournalledWriteEndFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pos = 3;
+    uint32 len = 4;
+    uint32 copied = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_load_inode/format
+message Ext4LoadInodeFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_load_inode_bitmap/format
+message Ext4LoadInodeBitmapFormat {
+    uint64 dev = 1;
+    uint32 group = 2;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_mark_inode_dirty/format
+message Ext4MarkInodeDirtyFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 ip = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_mb_bitmap_load/format
+message Ext4MbBitmapLoadFormat {
+    uint64 dev = 1;
+    uint32 group = 2;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_mb_buddy_bitmap_load/format
+message Ext4MbBuddyBitmapLoadFormat {
+    uint64 dev = 1;
+    uint32 group = 2;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_mb_discard_preallocations/format
+message Ext4MbDiscardPreallocationsFormat {
+    uint64 dev = 1;
+    int32 needed = 2;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_mb_new_group_pa/format
+message Ext4MbNewGroupPaFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pa_pstart = 3;
+    uint64 pa_lstart = 4;
+    uint32 pa_len = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_mb_new_inode_pa/format
+message Ext4MbNewInodePaFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pa_pstart = 3;
+    uint64 pa_lstart = 4;
+    uint32 pa_len = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_mb_release_group_pa/format
+message Ext4MbReleaseGroupPaFormat {
+    uint64 dev = 1;
+    uint64 pa_pstart = 2;
+    uint32 pa_len = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_mb_release_inode_pa/format
+message Ext4MbReleaseInodePaFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 block = 3;
+    uint32 count = 4;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_mballoc_alloc/format
+message Ext4MballocAllocFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 orig_logical = 3;
+    int32 orig_start = 4;
+    uint32 orig_group = 5;
+    int32 orig_len = 6;
+    uint32 goal_logical = 7;
+    int32 goal_start = 8;
+    uint32 goal_group = 9;
+    int32 goal_len = 10;
+    uint32 result_logical = 11;
+    int32 result_start = 12;
+    uint32 result_group = 13;
+    int32 result_len = 14;
+    uint32 found = 15;
+    uint32 groups = 16;
+    uint32 buddy = 17;
+    uint32 flags = 18;
+    uint32 tail = 19;
+    uint32 cr = 20;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_mballoc_discard/format
+message Ext4MballocDiscardFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    int32 result_start = 3;
+    uint32 result_group = 4;
+    int32 result_len = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_mballoc_free/format
+message Ext4MballocFreeFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    int32 result_start = 3;
+    uint32 result_group = 4;
+    int32 result_len = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_mballoc_prealloc/format
+message Ext4MballocPreallocFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 orig_logical = 3;
+    int32 orig_start = 4;
+    uint32 orig_group = 5;
+    int32 orig_len = 6;
+    uint32 result_logical = 7;
+    int32 result_start = 8;
+    uint32 result_group = 9;
+    int32 result_len = 10;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_other_inode_update_time/format
+message Ext4OtherInodeUpdateTimeFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 orig_ino = 3;
+    uint32 uid = 4;
+    uint32 gid = 5;
+    uint32 mode = 6;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_punch_hole/format
+message Ext4PunchHoleFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 offset = 3;
+    uint64 len = 4;
+    int32 mode = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_read_block_bitmap_load/format
+message Ext4ReadBlockBitmapLoadFormat {
+    uint64 dev = 1;
+    uint32 group = 2;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_readpage/format
+message Ext4ReadpageFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 index = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_releasepage/format
+message Ext4ReleasepageFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 index = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_remove_blocks/format
+message Ext4RemoveBlocksFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 from = 3;
+    uint32 to = 4;
+    uint64 partial = 5;
+    uint64 ee_pblk = 6;
+    uint32 ee_lblk = 7;
+    uint32 ee_len = 8;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_request_blocks/format
+message Ext4RequestBlocksFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint32 len = 3;
+    uint32 logical = 4;
+    uint32 lleft = 5;
+    uint32 lright = 6;
+    uint64 goal = 7;
+    uint64 pleft = 8;
+    uint64 pright = 9;
+    uint32 flags = 10;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_request_inode/format
+message Ext4RequestInodeFormat {
+    uint64 dev = 1;
+    uint64 dir = 2;
+    uint32 mode = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_sync_file_enter/format
+message Ext4SyncFileEnterFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 parent = 3;
+    int32 datasync = 4;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_sync_file_exit/format
+message Ext4SyncFileExitFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    int32 ret = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_sync_fs/format
+message Ext4SyncFsFormat {
+    uint64 dev = 1;
+    int32 wait = 2;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_trim_all_free/format
+message Ext4TrimAllFreeFormat {
+    int32 dev_major = 1;
+    int32 dev_minor = 2;
+    uint32 group = 3;
+    int32 start = 4;
+    int32 len = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_trim_extent/format
+message Ext4TrimExtentFormat {
+    int32 dev_major = 1;
+    int32 dev_minor = 2;
+    uint32 group = 3;
+    int32 start = 4;
+    int32 len = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_truncate_enter/format
+message Ext4TruncateEnterFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 blocks = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_truncate_exit/format
+message Ext4TruncateExitFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 blocks = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_unlink_enter/format
+message Ext4UnlinkEnterFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 parent = 3;
+    uint64 size = 4;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_unlink_exit/format
+message Ext4UnlinkExitFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    int32 ret = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_write_begin/format
+message Ext4WriteBeginFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pos = 3;
+    uint32 len = 4;
+    uint32 flags = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_write_end/format
+message Ext4WriteEndFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pos = 3;
+    uint32 len = 4;
+    uint32 copied = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_writepage/format
+message Ext4WritepageFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 index = 3;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_writepages/format
+message Ext4WritepagesFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 nr_to_write = 3;
+    uint64 pages_skipped = 4;
+    uint64 range_start = 5;
+    uint64 range_end = 6;
+    uint64 writeback_index = 7;
+    int32 sync_mode = 8;
+    uint32 for_kupdate = 9;
+    uint32 range_cyclic = 10;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_writepages_result/format
+message Ext4WritepagesResultFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    int32 ret = 3;
+    int32 pages_written = 4;
+    uint64 pages_skipped = 5;
+    uint64 writeback_index = 6;
+    int32 sync_mode = 7;
+}
+
+// /sys/kernel/debug/tracing/events/ext4/ext4_zero_range/format
+message Ext4ZeroRangeFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 offset = 3;
+    uint64 len = 4;
+    int32 mode = 5;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/f2fs.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/f2fs.proto
new file mode 100644
index 0000000000000000000000000000000000000000..370be1cd2b9959a97ef39125f728de908881464a
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/f2fs.proto
@@ -0,0 +1,59 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: f2fs
+// /sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_enter/format
+message F2fsSyncFileEnterFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pino = 3;
+    uint32 mode = 4;
+    uint64 size = 5;
+    uint32 nlink = 6;
+    uint64 blocks = 7;
+    uint32 advise = 8;
+}
+
+// /sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_exit/format
+message F2fsSyncFileExitFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    int32 cp_reason = 3;
+    int32 datasync = 4;
+    int32 ret = 5;
+}
+
+// /sys/kernel/debug/tracing/events/f2fs/f2fs_write_begin/format
+message F2fsWriteBeginFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pos = 3;
+    uint32 len = 4;
+    uint32 flags = 5;
+}
+
+// /sys/kernel/debug/tracing/events/f2fs/f2fs_write_end/format
+message F2fsWriteEndFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 pos = 3;
+    uint32 len = 4;
+    uint32 copied = 5;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/filelock.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/filelock.proto
new file mode 100755
index 0000000000000000000000000000000000000000..1a52d8c9f3c34b90b57db8f8da444eb2d7c62c91
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/filelock.proto
@@ -0,0 +1,97 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: filelock
+// /sys/kernel/debug/tracing/events/filelock/break_lease_block/format
+message BreakLeaseBlockFormat {
+    uint64 fl = 1;
+    uint64 i_ino = 2;
+    uint64 s_dev = 3;
+    uint64 fl_next = 4;
+    uint32 fl_owner = 5;
+    uint32 fl_flags = 6;
+    uint32 fl_type = 7;
+    uint64 fl_break_time = 8;
+    uint64 fl_downgrade_time = 9;
+}
+
+// /sys/kernel/debug/tracing/events/filelock/break_lease_noblock/format
+message BreakLeaseNoblockFormat {
+    uint64 fl = 1;
+    uint64 i_ino = 2;
+    uint64 s_dev = 3;
+    uint64 fl_next = 4;
+    uint32 fl_owner = 5;
+    uint32 fl_flags = 6;
+    uint32 fl_type = 7;
+    uint64 fl_break_time = 8;
+    uint64 fl_downgrade_time = 9;
+}
+
+// /sys/kernel/debug/tracing/events/filelock/break_lease_unblock/format
+message BreakLeaseUnblockFormat {
+    uint64 fl = 1;
+    uint64 i_ino = 2;
+    uint64 s_dev = 3;
+    uint64 fl_next = 4;
+    uint32 fl_owner = 5;
+    uint32 fl_flags = 6;
+    uint32 fl_type = 7;
+    uint64 fl_break_time = 8;
+    uint64 fl_downgrade_time = 9;
+}
+
+// /sys/kernel/debug/tracing/events/filelock/generic_add_lease/format
+message GenericAddLeaseFormat {
+    uint64 i_ino = 1;
+    int32 wcount = 2;
+    int32 dcount = 3;
+    int32 icount = 4;
+    uint64 s_dev = 5;
+    uint32 fl_owner = 6;
+    uint32 fl_flags = 7;
+    uint32 fl_type = 8;
+}
+
+// /sys/kernel/debug/tracing/events/filelock/generic_delete_lease/format
+message GenericDeleteLeaseFormat {
+    uint64 fl = 1;
+    uint64 i_ino = 2;
+    uint64 s_dev = 3;
+    uint64 fl_next = 4;
+    uint32 fl_owner = 5;
+    uint32 fl_flags = 6;
+    uint32 fl_type = 7;
+    uint64 fl_break_time = 8;
+    uint64 fl_downgrade_time = 9;
+}
+
+// /sys/kernel/debug/tracing/events/filelock/time_out_leases/format
+message TimeOutLeasesFormat {
+    uint64 fl = 1;
+    uint64 i_ino = 2;
+    uint64 s_dev = 3;
+    uint64 fl_next = 4;
+    uint32 fl_owner = 5;
+    uint32 fl_flags = 6;
+    uint32 fl_type = 7;
+    uint64 fl_break_time = 8;
+    uint64 fl_downgrade_time = 9;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/filemap.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/filemap.proto
new file mode 100644
index 0000000000000000000000000000000000000000..a1621207a719d050a76f23e90b91012ac6526ad8
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/filemap.proto
@@ -0,0 +1,52 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: filemap
+// /sys/kernel/debug/tracing/events/filemap/file_check_and_advance_wb_err/format
+message FileCheckAndAdvanceWbErrFormat {
+    uint64 file = 1;
+    uint64 i_ino = 2;
+    uint64 s_dev = 3;
+    uint32 old = 4;
+    uint32 seq_new = 5;
+}
+
+// /sys/kernel/debug/tracing/events/filemap/filemap_set_wb_err/format
+message FilemapSetWbErrFormat {
+    uint64 i_ino = 1;
+    uint64 s_dev = 2;
+    uint32 errseq = 3;
+}
+
+// /sys/kernel/debug/tracing/events/filemap/mm_filemap_add_to_page_cache/format
+message MmFilemapAddToPageCacheFormat {
+    uint64 pfn = 1;
+    uint64 i_ino = 2;
+    uint64 index = 3;
+    uint64 s_dev = 4;
+}
+
+// /sys/kernel/debug/tracing/events/filemap/mm_filemap_delete_from_page_cache/format
+message MmFilemapDeleteFromPageCacheFormat {
+    uint64 pfn = 1;
+    uint64 i_ino = 2;
+    uint64 index = 3;
+    uint64 s_dev = 4;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/ftrace.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/ftrace.proto
new file mode 100755
index 0000000000000000000000000000000000000000..80c23a999c8129916bd7608b0e3c99fe107181b4
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/ftrace.proto
@@ -0,0 +1,115 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: ftrace
+// /sys/kernel/debug/tracing/events/ftrace/bputs/format
+message BputsFormat {
+    uint64 ip = 1;
+    string str = 2;
+}
+
+// /sys/kernel/debug/tracing/events/ftrace/branch/format
+message BranchFormat {
+    uint32 line = 1;
+    string func = 2;
+    string file = 3;
+    uint32 correct = 4;
+    uint32 constant = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ftrace/context_switch/format
+message ContextSwitchFormat {
+    uint32 prev_pid = 1;
+    uint32 next_pid = 2;
+    uint32 next_cpu = 3;
+    uint32 prev_prio = 4;
+    uint32 prev_state = 5;
+    uint32 next_prio = 6;
+    uint32 next_state = 7;
+}
+
+// /sys/kernel/debug/tracing/events/ftrace/funcgraph_entry/format
+message FuncgraphEntryFormat {
+    uint64 func = 1;
+    int32 depth = 2;
+}
+
+// /sys/kernel/debug/tracing/events/ftrace/funcgraph_exit/format
+message FuncgraphExitFormat {
+    uint64 func = 1;
+    uint64 calltime = 2;
+    uint64 rettime = 3;
+    uint64 overrun = 4;
+    int32 depth = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ftrace/function/format
+message FunctionFormat {
+    uint64 ip = 1;
+    uint64 parent_ip = 2;
+}
+
+// /sys/kernel/debug/tracing/events/ftrace/kernel_stack/format
+message KernelStackFormat {
+    int32 size = 1;
+    repeated uint64 caller = 2;
+}
+
+// /sys/kernel/debug/tracing/events/ftrace/mmiotrace_map/format
+message MmiotraceMapFormat {
+    uint64 phys = 1;
+    uint64 virt = 2;
+    uint64 len = 3;
+    int32 map_id = 4;
+    uint32 opcode = 5;
+}
+
+// /sys/kernel/debug/tracing/events/ftrace/mmiotrace_rw/format
+message MmiotraceRwFormat {
+    uint64 phys = 1;
+    uint64 value = 2;
+    uint64 pc = 3;
+    int32 map_id = 4;
+    uint32 opcode = 5;
+    uint32 width = 6;
+}
+
+// /sys/kernel/debug/tracing/events/ftrace/print/format
+message PrintFormat {
+    uint64 ip = 1;
+    string buf = 2;
+}
+
+// /sys/kernel/debug/tracing/events/ftrace/user_stack/format
+message UserStackFormat {
+    uint32 tgid = 1;
+    repeated uint64 caller = 2;
+}
+
+// /sys/kernel/debug/tracing/events/ftrace/wakeup/format
+message WakeupFormat {
+    uint32 prev_pid = 1;
+    uint32 next_pid = 2;
+    uint32 next_cpu = 3;
+    uint32 prev_prio = 4;
+    uint32 prev_state = 5;
+    uint32 next_prio = 6;
+    uint32 next_state = 7;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/ftrace_event.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/ftrace_event.proto
new file mode 100644
index 0000000000000000000000000000000000000000..e979685300ccc34867fe91b110b52ec010531fcc
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/ftrace_event.proto
@@ -0,0 +1,482 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+import "binder.proto";
+import "block.proto";
+import "cgroup.proto";
+import "clk.proto";
+import "compaction.proto";
+import "cpuhp.proto";
+import "dma_fence.proto";
+import "ext4.proto";
+import "f2fs.proto";
+import "filelock.proto";
+import "filemap.proto";
+import "ftrace.proto";
+import "gpio.proto";
+import "gpu_mem.proto";
+import "i2c.proto";
+import "ipi.proto";
+import "irq.proto";
+import "kmem.proto";
+import "mmc.proto";
+import "net.proto";
+import "oom.proto";
+import "pagemap.proto";
+import "power.proto";
+import "printk.proto";
+import "raw_syscalls.proto";
+import "rcu.proto";
+import "regulator.proto";
+import "sched.proto";
+import "signal.proto";
+import "sunrpc.proto";
+import "task.proto";
+import "timer.proto";
+import "v4l2.proto";
+import "vmscan.proto";
+import "workqueue.proto";
+import "writeback.proto";
+
+message FtraceEvent {
+    uint64 timestamp = 1;
+    int32 tgid = 2;
+    string comm = 3;
+
+    message CommonFileds {
+        uint32 type = 1;
+        uint32 flags = 2;
+        uint32 preempt_count = 3;
+        int32 pid = 4;
+    };
+    CommonFileds common_fields = 50;
+
+    oneof event {
+        BinderAllocLruEndFormat binder_alloc_lru_end_format = 100;
+        BinderAllocLruStartFormat binder_alloc_lru_start_format = 101;
+        BinderAllocPageEndFormat binder_alloc_page_end_format = 102;
+        BinderAllocPageStartFormat binder_alloc_page_start_format = 103;
+        BinderCommandFormat binder_command_format = 104;
+        BinderFreeLruEndFormat binder_free_lru_end_format = 105;
+        BinderFreeLruStartFormat binder_free_lru_start_format = 106;
+        BinderIoctlFormat binder_ioctl_format = 107;
+        BinderIoctlDoneFormat binder_ioctl_done_format = 108;
+        BinderLockFormat binder_lock_format = 109;
+        BinderLockedFormat binder_locked_format = 110;
+        BinderReadDoneFormat binder_read_done_format = 111;
+        BinderReturnFormat binder_return_format = 112;
+        BinderTransactionFormat binder_transaction_format = 113;
+        BinderTransactionAllocBufFormat binder_transaction_alloc_buf_format = 114;
+        BinderTransactionBufferReleaseFormat binder_transaction_buffer_release_format = 115;
+        BinderTransactionFailedBufferReleaseFormat binder_transaction_failed_buffer_release_format = 116;
+        BinderTransactionFdFormat binder_transaction_fd_format = 117;
+        BinderTransactionNodeToRefFormat binder_transaction_node_to_ref_format = 118;
+        BinderTransactionReceivedFormat binder_transaction_received_format = 119;
+        BinderTransactionRefToNodeFormat binder_transaction_ref_to_node_format = 120;
+        BinderTransactionRefToRefFormat binder_transaction_ref_to_ref_format = 121;
+        BinderUnlockFormat binder_unlock_format = 122;
+        BinderUnmapKernelEndFormat binder_unmap_kernel_end_format = 123;
+        BinderUnmapKernelStartFormat binder_unmap_kernel_start_format = 124;
+        BinderUnmapUserEndFormat binder_unmap_user_end_format = 125;
+        BinderUnmapUserStartFormat binder_unmap_user_start_format = 126;
+        BinderUpdatePageRangeFormat binder_update_page_range_format = 127;
+        BinderWaitForWorkFormat binder_wait_for_work_format = 128;
+        BinderWriteDoneFormat binder_write_done_format = 129;
+        BlockBioBackmergeFormat block_bio_backmerge_format = 200;
+        BlockBioBounceFormat block_bio_bounce_format = 201;
+        BlockBioCompleteFormat block_bio_complete_format = 202;
+        BlockBioFrontmergeFormat block_bio_frontmerge_format = 203;
+        BlockBioQueueFormat block_bio_queue_format = 204;
+        BlockBioRemapFormat block_bio_remap_format = 205;
+        BlockDirtyBufferFormat block_dirty_buffer_format = 206;
+        BlockGetrqFormat block_getrq_format = 207;
+        BlockPlugFormat block_plug_format = 208;
+        BlockRqCompleteFormat block_rq_complete_format = 209;
+        BlockRqInsertFormat block_rq_insert_format = 210;
+        BlockRqIssueFormat block_rq_issue_format = 211;
+        BlockRqRemapFormat block_rq_remap_format = 212;
+        BlockRqRequeueFormat block_rq_requeue_format = 213;
+        BlockSleeprqFormat block_sleeprq_format = 214;
+        BlockSplitFormat block_split_format = 215;
+        BlockTouchBufferFormat block_touch_buffer_format = 216;
+        BlockUnplugFormat block_unplug_format = 217;
+        CgroupAttachTaskFormat cgroup_attach_task_format = 300;
+        CgroupDestroyRootFormat cgroup_destroy_root_format = 301;
+        CgroupMkdirFormat cgroup_mkdir_format = 302;
+        CgroupReleaseFormat cgroup_release_format = 303;
+        CgroupRemountFormat cgroup_remount_format = 304;
+        CgroupRenameFormat cgroup_rename_format = 305;
+        CgroupRmdirFormat cgroup_rmdir_format = 306;
+        CgroupSetupRootFormat cgroup_setup_root_format = 307;
+        CgroupTransferTasksFormat cgroup_transfer_tasks_format = 308;
+        ClkDisableFormat clk_disable_format = 400;
+        ClkDisableCompleteFormat clk_disable_complete_format = 401;
+        ClkEnableFormat clk_enable_format = 402;
+        ClkEnableCompleteFormat clk_enable_complete_format = 403;
+        ClkPrepareFormat clk_prepare_format = 404;
+        ClkPrepareCompleteFormat clk_prepare_complete_format = 405;
+        ClkSetParentFormat clk_set_parent_format = 406;
+        ClkSetParentCompleteFormat clk_set_parent_complete_format = 407;
+        ClkSetPhaseFormat clk_set_phase_format = 408;
+        ClkSetPhaseCompleteFormat clk_set_phase_complete_format = 409;
+        ClkSetRateFormat clk_set_rate_format = 410;
+        ClkSetRateCompleteFormat clk_set_rate_complete_format = 411;
+        ClkUnprepareFormat clk_unprepare_format = 412;
+        ClkUnprepareCompleteFormat clk_unprepare_complete_format = 413;
+        MmCompactionBeginFormat mm_compaction_begin_format = 500;
+        MmCompactionDeferCompactionFormat mm_compaction_defer_compaction_format = 501;
+        MmCompactionDeferResetFormat mm_compaction_defer_reset_format = 502;
+        MmCompactionDeferredFormat mm_compaction_deferred_format = 503;
+        MmCompactionEndFormat mm_compaction_end_format = 504;
+        MmCompactionFinishedFormat mm_compaction_finished_format = 505;
+        MmCompactionIsolateFreepagesFormat mm_compaction_isolate_freepages_format = 506;
+        MmCompactionIsolateMigratepagesFormat mm_compaction_isolate_migratepages_format = 507;
+        MmCompactionMigratepagesFormat mm_compaction_migratepages_format = 508;
+        MmCompactionSuitableFormat mm_compaction_suitable_format = 509;
+        MmCompactionTryToCompactPagesFormat mm_compaction_try_to_compact_pages_format = 510;
+        CpuhpEnterFormat cpuhp_enter_format = 600;
+        CpuhpExitFormat cpuhp_exit_format = 601;
+        CpuhpMultiEnterFormat cpuhp_multi_enter_format = 602;
+        DmaFenceDestroyFormat dma_fence_destroy_format = 700;
+        DmaFenceEmitFormat dma_fence_emit_format = 701;
+        DmaFenceEnableSignalFormat dma_fence_enable_signal_format = 702;
+        DmaFenceInitFormat dma_fence_init_format = 703;
+        DmaFenceSignaledFormat dma_fence_signaled_format = 704;
+        DmaFenceWaitEndFormat dma_fence_wait_end_format = 705;
+        DmaFenceWaitStartFormat dma_fence_wait_start_format = 706;
+        Ext4AllocDaBlocksFormat ext4_alloc_da_blocks_format = 800;
+        Ext4AllocateBlocksFormat ext4_allocate_blocks_format = 801;
+        Ext4AllocateInodeFormat ext4_allocate_inode_format = 802;
+        Ext4BeginOrderedTruncateFormat ext4_begin_ordered_truncate_format = 803;
+        Ext4CollapseRangeFormat ext4_collapse_range_format = 804;
+        Ext4DaReleaseSpaceFormat ext4_da_release_space_format = 805;
+        Ext4DaReserveSpaceFormat ext4_da_reserve_space_format = 806;
+        Ext4DaUpdateReserveSpaceFormat ext4_da_update_reserve_space_format = 807;
+        Ext4DaWriteBeginFormat ext4_da_write_begin_format = 808;
+        Ext4DaWriteEndFormat ext4_da_write_end_format = 809;
+        Ext4DaWritePagesFormat ext4_da_write_pages_format = 810;
+        Ext4DaWritePagesExtentFormat ext4_da_write_pages_extent_format = 811;
+        Ext4DirectIoEnterFormat ext4_direct_io_enter_format = 812;
+        Ext4DirectIoExitFormat ext4_direct_io_exit_format = 813;
+        Ext4DiscardBlocksFormat ext4_discard_blocks_format = 814;
+        Ext4DiscardPreallocationsFormat ext4_discard_preallocations_format = 815;
+        Ext4DropInodeFormat ext4_drop_inode_format = 816;
+        Ext4EsCacheExtentFormat ext4_es_cache_extent_format = 817;
+        Ext4EsFindDelayedExtentRangeEnterFormat ext4_es_find_delayed_extent_range_enter_format = 818;
+        Ext4EsFindDelayedExtentRangeExitFormat ext4_es_find_delayed_extent_range_exit_format = 819;
+        Ext4EsInsertExtentFormat ext4_es_insert_extent_format = 820;
+        Ext4EsLookupExtentEnterFormat ext4_es_lookup_extent_enter_format = 821;
+        Ext4EsLookupExtentExitFormat ext4_es_lookup_extent_exit_format = 822;
+        Ext4EsRemoveExtentFormat ext4_es_remove_extent_format = 823;
+        Ext4EsShrinkFormat ext4_es_shrink_format = 824;
+        Ext4EsShrinkCountFormat ext4_es_shrink_count_format = 825;
+        Ext4EsShrinkScanEnterFormat ext4_es_shrink_scan_enter_format = 826;
+        Ext4EsShrinkScanExitFormat ext4_es_shrink_scan_exit_format = 827;
+        Ext4EvictInodeFormat ext4_evict_inode_format = 828;
+        Ext4ExtConvertToInitializedEnterFormat ext4_ext_convert_to_initialized_enter_format = 829;
+        Ext4ExtConvertToInitializedFastpathFormat ext4_ext_convert_to_initialized_fastpath_format = 830;
+        Ext4ExtHandleUnwrittenExtentsFormat ext4_ext_handle_unwritten_extents_format = 831;
+        Ext4ExtInCacheFormat ext4_ext_in_cache_format = 832;
+        Ext4ExtLoadExtentFormat ext4_ext_load_extent_format = 833;
+        Ext4ExtMapBlocksEnterFormat ext4_ext_map_blocks_enter_format = 834;
+        Ext4ExtMapBlocksExitFormat ext4_ext_map_blocks_exit_format = 835;
+        Ext4ExtPutInCacheFormat ext4_ext_put_in_cache_format = 836;
+        Ext4ExtRemoveSpaceFormat ext4_ext_remove_space_format = 837;
+        Ext4ExtRemoveSpaceDoneFormat ext4_ext_remove_space_done_format = 838;
+        Ext4ExtRmIdxFormat ext4_ext_rm_idx_format = 839;
+        Ext4ExtRmLeafFormat ext4_ext_rm_leaf_format = 840;
+        Ext4ExtShowExtentFormat ext4_ext_show_extent_format = 841;
+        Ext4FallocateEnterFormat ext4_fallocate_enter_format = 842;
+        Ext4FallocateExitFormat ext4_fallocate_exit_format = 843;
+        Ext4FindDelallocRangeFormat ext4_find_delalloc_range_format = 844;
+        Ext4ForgetFormat ext4_forget_format = 845;
+        Ext4FreeBlocksFormat ext4_free_blocks_format = 846;
+        Ext4FreeInodeFormat ext4_free_inode_format = 847;
+        Ext4GetImpliedClusterAllocExitFormat ext4_get_implied_cluster_alloc_exit_format = 848;
+        Ext4GetReservedClusterAllocFormat ext4_get_reserved_cluster_alloc_format = 849;
+        Ext4IndMapBlocksEnterFormat ext4_ind_map_blocks_enter_format = 850;
+        Ext4IndMapBlocksExitFormat ext4_ind_map_blocks_exit_format = 851;
+        Ext4InsertRangeFormat ext4_insert_range_format = 852;
+        Ext4InvalidatepageFormat ext4_invalidatepage_format = 853;
+        Ext4JournalStartFormat ext4_journal_start_format = 854;
+        Ext4JournalStartReservedFormat ext4_journal_start_reserved_format = 855;
+        Ext4JournalledInvalidatepageFormat ext4_journalled_invalidatepage_format = 856;
+        Ext4JournalledWriteEndFormat ext4_journalled_write_end_format = 857;
+        Ext4LoadInodeFormat ext4_load_inode_format = 858;
+        Ext4LoadInodeBitmapFormat ext4_load_inode_bitmap_format = 859;
+        Ext4MarkInodeDirtyFormat ext4_mark_inode_dirty_format = 860;
+        Ext4MbBitmapLoadFormat ext4_mb_bitmap_load_format = 861;
+        Ext4MbBuddyBitmapLoadFormat ext4_mb_buddy_bitmap_load_format = 862;
+        Ext4MbDiscardPreallocationsFormat ext4_mb_discard_preallocations_format = 863;
+        Ext4MbNewGroupPaFormat ext4_mb_new_group_pa_format = 864;
+        Ext4MbNewInodePaFormat ext4_mb_new_inode_pa_format = 865;
+        Ext4MbReleaseGroupPaFormat ext4_mb_release_group_pa_format = 866;
+        Ext4MbReleaseInodePaFormat ext4_mb_release_inode_pa_format = 867;
+        Ext4MballocAllocFormat ext4_mballoc_alloc_format = 868;
+        Ext4MballocDiscardFormat ext4_mballoc_discard_format = 869;
+        Ext4MballocFreeFormat ext4_mballoc_free_format = 870;
+        Ext4MballocPreallocFormat ext4_mballoc_prealloc_format = 871;
+        Ext4OtherInodeUpdateTimeFormat ext4_other_inode_update_time_format = 872;
+        Ext4PunchHoleFormat ext4_punch_hole_format = 873;
+        Ext4ReadBlockBitmapLoadFormat ext4_read_block_bitmap_load_format = 874;
+        Ext4ReadpageFormat ext4_readpage_format = 875;
+        Ext4ReleasepageFormat ext4_releasepage_format = 876;
+        Ext4RemoveBlocksFormat ext4_remove_blocks_format = 877;
+        Ext4RequestBlocksFormat ext4_request_blocks_format = 878;
+        Ext4RequestInodeFormat ext4_request_inode_format = 879;
+        Ext4SyncFileEnterFormat ext4_sync_file_enter_format = 880;
+        Ext4SyncFileExitFormat ext4_sync_file_exit_format = 881;
+        Ext4SyncFsFormat ext4_sync_fs_format = 882;
+        Ext4TrimAllFreeFormat ext4_trim_all_free_format = 883;
+        Ext4TrimExtentFormat ext4_trim_extent_format = 884;
+        Ext4TruncateEnterFormat ext4_truncate_enter_format = 885;
+        Ext4TruncateExitFormat ext4_truncate_exit_format = 886;
+        Ext4UnlinkEnterFormat ext4_unlink_enter_format = 887;
+        Ext4UnlinkExitFormat ext4_unlink_exit_format = 888;
+        Ext4WriteBeginFormat ext4_write_begin_format = 889;
+        Ext4WriteEndFormat ext4_write_end_format = 890;
+        Ext4WritepageFormat ext4_writepage_format = 891;
+        Ext4WritepagesFormat ext4_writepages_format = 892;
+        Ext4WritepagesResultFormat ext4_writepages_result_format = 893;
+        Ext4ZeroRangeFormat ext4_zero_range_format = 894;
+        BreakLeaseBlockFormat break_lease_block_format = 900;
+        BreakLeaseNoblockFormat break_lease_noblock_format = 901;
+        BreakLeaseUnblockFormat break_lease_unblock_format = 902;
+        GenericAddLeaseFormat generic_add_lease_format = 903;
+        GenericDeleteLeaseFormat generic_delete_lease_format = 904;
+        TimeOutLeasesFormat time_out_leases_format = 905;
+        MmFilemapAddToPageCacheFormat mm_filemap_add_to_page_cache_format = 1000;
+        MmFilemapDeleteFromPageCacheFormat mm_filemap_delete_from_page_cache_format = 1001;
+        BputsFormat bputs_format = 1100;
+        BranchFormat branch_format = 1101;
+        ContextSwitchFormat context_switch_format = 1102;
+        FuncgraphEntryFormat funcgraph_entry_format = 1103;
+        FuncgraphExitFormat funcgraph_exit_format = 1104;
+        FunctionFormat function_format = 1105;
+        KernelStackFormat kernel_stack_format = 1106;
+        MmiotraceMapFormat mmiotrace_map_format = 1107;
+        MmiotraceRwFormat mmiotrace_rw_format = 1108;
+        PrintFormat print_format = 1109;
+        UserStackFormat user_stack_format = 1110;
+        WakeupFormat wakeup_format = 1111;
+        GpioDirectionFormat gpio_direction_format = 1200;
+        GpioValueFormat gpio_value_format = 1201;
+        I2cReadFormat i2c_read_format = 1300;
+        I2cReplyFormat i2c_reply_format = 1301;
+        I2cResultFormat i2c_result_format = 1302;
+        I2cWriteFormat i2c_write_format = 1303;
+        IpiEntryFormat ipi_entry_format = 1400;
+        IpiExitFormat ipi_exit_format = 1401;
+        IpiRaiseFormat ipi_raise_format = 1402;
+        IrqHandlerEntryFormat irq_handler_entry_format = 1500;
+        IrqHandlerExitFormat irq_handler_exit_format = 1501;
+        SoftirqEntryFormat softirq_entry_format = 1502;
+        SoftirqExitFormat softirq_exit_format = 1503;
+        SoftirqRaiseFormat softirq_raise_format = 1504;
+        KfreeFormat kfree_format = 1600;
+        KmallocFormat kmalloc_format = 1601;
+        KmallocNodeFormat kmalloc_node_format = 1602;
+        KmemCacheAllocFormat kmem_cache_alloc_format = 1603;
+        KmemCacheAllocNodeFormat kmem_cache_alloc_node_format = 1604;
+        KmemCacheFreeFormat kmem_cache_free_format = 1605;
+        MmPageAllocFormat mm_page_alloc_format = 1606;
+        MmPageAllocExtfragFormat mm_page_alloc_extfrag_format = 1607;
+        MmPageAllocZoneLockedFormat mm_page_alloc_zone_locked_format = 1608;
+        MmPageFreeFormat mm_page_free_format = 1609;
+        MmPageFreeBatchedFormat mm_page_free_batched_format = 1610;
+        MmPagePcpuDrainFormat mm_page_pcpu_drain_format = 1611;
+        NapiGroFragsEntryFormat napi_gro_frags_entry_format = 1700;
+        NapiGroReceiveEntryFormat napi_gro_receive_entry_format = 1701;
+        NetDevQueueFormat net_dev_queue_format = 1702;
+        NetDevStartXmitFormat net_dev_start_xmit_format = 1703;
+        NetDevXmitFormat net_dev_xmit_format = 1704;
+        NetifReceiveSkbFormat netif_receive_skb_format = 1705;
+        NetifReceiveSkbEntryFormat netif_receive_skb_entry_format = 1706;
+        NetifRxFormat netif_rx_format = 1707;
+        NetifRxEntryFormat netif_rx_entry_format = 1708;
+        NetifRxNiEntryFormat netif_rx_ni_entry_format = 1709;
+        OomScoreAdjUpdateFormat oom_score_adj_update_format = 1800;
+        MmLruActivateFormat mm_lru_activate_format = 1900;
+        MmLruInsertionFormat mm_lru_insertion_format = 1901;
+        ClockDisableFormat clock_disable_format = 2000;
+        ClockEnableFormat clock_enable_format = 2001;
+        ClockSetRateFormat clock_set_rate_format = 2002;
+        CpuFrequencyFormat cpu_frequency_format = 2003;
+        CpuFrequencyLimitsFormat cpu_frequency_limits_format = 2004;
+        CpuIdleFormat cpu_idle_format = 2005;
+        DevPmQosAddRequestFormat dev_pm_qos_add_request_format = 2006;
+        DevPmQosRemoveRequestFormat dev_pm_qos_remove_request_format = 2007;
+        DevPmQosUpdateRequestFormat dev_pm_qos_update_request_format = 2008;
+        DevicePmCallbackEndFormat device_pm_callback_end_format = 2009;
+        DevicePmCallbackStartFormat device_pm_callback_start_format = 2010;
+        PmQosAddRequestFormat pm_qos_add_request_format = 2011;
+        PmQosRemoveRequestFormat pm_qos_remove_request_format = 2012;
+        PmQosUpdateFlagsFormat pm_qos_update_flags_format = 2013;
+        PmQosUpdateRequestFormat pm_qos_update_request_format = 2014;
+        PmQosUpdateRequestTimeoutFormat pm_qos_update_request_timeout_format = 2015;
+        PmQosUpdateTargetFormat pm_qos_update_target_format = 2016;
+        PowerDomainTargetFormat power_domain_target_format = 2017;
+        PstateSampleFormat pstate_sample_format = 2018;
+        SuspendResumeFormat suspend_resume_format = 2019;
+        WakeupSourceActivateFormat wakeup_source_activate_format = 2020;
+        WakeupSourceDeactivateFormat wakeup_source_deactivate_format = 2021;
+        ConsoleFormat console_format = 2100;
+        SysEnterFormat sys_enter_format = 2200;
+        SysExitFormat sys_exit_format = 2201;
+        RcuUtilizationFormat rcu_utilization_format = 2300;
+        SchedKthreadStopFormat sched_kthread_stop_format = 2400;
+        SchedKthreadStopRetFormat sched_kthread_stop_ret_format = 2401;
+        SchedMigrateTaskFormat sched_migrate_task_format = 2402;
+        SchedMoveNumaFormat sched_move_numa_format = 2403;
+        SchedPiSetprioFormat sched_pi_setprio_format = 2404;
+        SchedProcessExecFormat sched_process_exec_format = 2405;
+        SchedProcessExitFormat sched_process_exit_format = 2406;
+        SchedProcessForkFormat sched_process_fork_format = 2407;
+        SchedProcessFreeFormat sched_process_free_format = 2408;
+        SchedProcessWaitFormat sched_process_wait_format = 2409;
+        SchedStatBlockedFormat sched_stat_blocked_format = 2410;
+        SchedStatIowaitFormat sched_stat_iowait_format = 2411;
+        SchedStatRuntimeFormat sched_stat_runtime_format = 2412;
+        SchedStatSleepFormat sched_stat_sleep_format = 2413;
+        SchedStatWaitFormat sched_stat_wait_format = 2414;
+        SchedStickNumaFormat sched_stick_numa_format = 2415;
+        SchedSwapNumaFormat sched_swap_numa_format = 2416;
+        SchedSwitchFormat sched_switch_format = 2417;
+        SchedWaitTaskFormat sched_wait_task_format = 2418;
+        SchedWakeIdleWithoutIpiFormat sched_wake_idle_without_ipi_format = 2419;
+        SchedWakeupFormat sched_wakeup_format = 2420;
+        SchedWakeupNewFormat sched_wakeup_new_format = 2421;
+        SchedWakingFormat sched_waking_format = 2422;
+        SignalDeliverFormat signal_deliver_format = 2500;
+        SignalGenerateFormat signal_generate_format = 2501;
+        RpcBindStatusFormat rpc_bind_status_format = 2600;
+        RpcCallStatusFormat rpc_call_status_format = 2601;
+        RpcConnectStatusFormat rpc_connect_status_format = 2602;
+        RpcSocketCloseFormat rpc_socket_close_format = 2603;
+        RpcSocketConnectFormat rpc_socket_connect_format = 2604;
+        RpcSocketErrorFormat rpc_socket_error_format = 2605;
+        RpcSocketResetConnectionFormat rpc_socket_reset_connection_format = 2606;
+        RpcSocketShutdownFormat rpc_socket_shutdown_format = 2607;
+        RpcSocketStateChangeFormat rpc_socket_state_change_format = 2608;
+        RpcTaskBeginFormat rpc_task_begin_format = 2609;
+        RpcTaskCompleteFormat rpc_task_complete_format = 2610;
+        RpcTaskRunActionFormat rpc_task_run_action_format = 2611;
+        RpcTaskSleepFormat rpc_task_sleep_format = 2612;
+        RpcTaskWakeupFormat rpc_task_wakeup_format = 2613;
+        SvcHandleXprtFormat svc_handle_xprt_format = 2614;
+        SvcProcessFormat svc_process_format = 2615;
+        SvcRecvFormat svc_recv_format = 2616;
+        SvcSendFormat svc_send_format = 2617;
+        SvcWakeUpFormat svc_wake_up_format = 2618;
+        SvcXprtDequeueFormat svc_xprt_dequeue_format = 2619;
+        SvcXprtDoEnqueueFormat svc_xprt_do_enqueue_format = 2620;
+        XprtCompleteRqstFormat xprt_complete_rqst_format = 2621;
+        XprtLookupRqstFormat xprt_lookup_rqst_format = 2622;
+        XprtTransmitFormat xprt_transmit_format = 2623;
+        XsTcpDataReadyFormat xs_tcp_data_ready_format = 2624;
+        XsTcpDataRecvFormat xs_tcp_data_recv_format = 2625;
+        TaskNewtaskFormat task_newtask_format = 2700;
+        TaskRenameFormat task_rename_format = 2701;
+        HrtimerCancelFormat hrtimer_cancel_format = 2800;
+        HrtimerExpireEntryFormat hrtimer_expire_entry_format = 2801;
+        HrtimerExpireExitFormat hrtimer_expire_exit_format = 2802;
+        HrtimerInitFormat hrtimer_init_format = 2803;
+        HrtimerStartFormat hrtimer_start_format = 2804;
+        ItimerExpireFormat itimer_expire_format = 2805;
+        ItimerStateFormat itimer_state_format = 2806;
+        TimerCancelFormat timer_cancel_format = 2807;
+        TimerExpireEntryFormat timer_expire_entry_format = 2808;
+        TimerExpireExitFormat timer_expire_exit_format = 2809;
+        TimerInitFormat timer_init_format = 2810;
+        TimerStartFormat timer_start_format = 2811;
+        V4l2DqbufFormat v4l2_dqbuf_format = 2900;
+        V4l2QbufFormat v4l2_qbuf_format = 2901;
+        Vb2V4l2BufDoneFormat vb2_v4l2_buf_done_format = 2902;
+        Vb2V4l2BufQueueFormat vb2_v4l2_buf_queue_format = 2903;
+        Vb2V4l2DqbufFormat vb2_v4l2_dqbuf_format = 2904;
+        Vb2V4l2QbufFormat vb2_v4l2_qbuf_format = 2905;
+        MmShrinkSlabEndFormat mm_shrink_slab_end_format = 3000;
+        MmShrinkSlabStartFormat mm_shrink_slab_start_format = 3001;
+        MmVmscanDirectReclaimBeginFormat mm_vmscan_direct_reclaim_begin_format = 3002;
+        MmVmscanDirectReclaimEndFormat mm_vmscan_direct_reclaim_end_format = 3003;
+        MmVmscanKswapdSleepFormat mm_vmscan_kswapd_sleep_format = 3004;
+        MmVmscanKswapdWakeFormat mm_vmscan_kswapd_wake_format = 3005;
+        MmVmscanLruIsolateFormat mm_vmscan_lru_isolate_format = 3006;
+        MmVmscanLruShrinkInactiveFormat mm_vmscan_lru_shrink_inactive_format = 3007;
+        MmVmscanWakeupKswapdFormat mm_vmscan_wakeup_kswapd_format = 3008;
+        MmVmscanWritepageFormat mm_vmscan_writepage_format = 3009;
+        WorkqueueActivateWorkFormat workqueue_activate_work_format = 3100;
+        WorkqueueExecuteEndFormat workqueue_execute_end_format = 3101;
+        WorkqueueExecuteStartFormat workqueue_execute_start_format = 3102;
+        WorkqueueQueueWorkFormat workqueue_queue_work_format = 3103;
+        BalanceDirtyPagesFormat balance_dirty_pages_format = 3200;
+        BdiDirtyRatelimitFormat bdi_dirty_ratelimit_format = 3201;
+        GlobalDirtyStateFormat global_dirty_state_format = 3202;
+        WbcWritepageFormat wbc_writepage_format = 3203;
+        WritebackBdiRegisterFormat writeback_bdi_register_format = 3204;
+        WritebackCongestionWaitFormat writeback_congestion_wait_format = 3205;
+        WritebackDirtyInodeFormat writeback_dirty_inode_format = 3206;
+        WritebackDirtyInodeEnqueueFormat writeback_dirty_inode_enqueue_format = 3207;
+        WritebackDirtyInodeStartFormat writeback_dirty_inode_start_format = 3208;
+        WritebackDirtyPageFormat writeback_dirty_page_format = 3209;
+        WritebackExecFormat writeback_exec_format = 3210;
+        WritebackLazytimeFormat writeback_lazytime_format = 3211;
+        WritebackLazytimeIputFormat writeback_lazytime_iput_format = 3212;
+        WritebackMarkInodeDirtyFormat writeback_mark_inode_dirty_format = 3213;
+        WritebackPagesWrittenFormat writeback_pages_written_format = 3214;
+        WritebackQueueFormat writeback_queue_format = 3215;
+        WritebackQueueIoFormat writeback_queue_io_format = 3216;
+        WritebackSbInodesRequeueFormat writeback_sb_inodes_requeue_format = 3217;
+        WritebackSingleInodeFormat writeback_single_inode_format = 3218;
+        WritebackSingleInodeStartFormat writeback_single_inode_start_format = 3219;
+        WritebackStartFormat writeback_start_format = 3220;
+        WritebackWaitFormat writeback_wait_format = 3221;
+        WritebackWaitIffCongestedFormat writeback_wait_iff_congested_format = 3222;
+        WritebackWakeBackgroundFormat writeback_wake_background_format = 3223;
+        WritebackWriteInodeFormat writeback_write_inode_format = 3224;
+        WritebackWriteInodeStartFormat writeback_write_inode_start_format = 3225;
+        WritebackWrittenFormat writeback_written_format = 3226;
+        RegulatorSetVoltageFormat regulator_set_voltage_format = 4000;
+        RegulatorSetVoltageCompleteFormat regulator_set_voltage_complete_format = 4001;
+        SchedBlockedReasonFormat sched_blocked_reason_format = 4002;
+        GpuMemTotalFormat gpu_mem_total_format = 4003;
+        RssStatFormat rss_stat_format = 4004;
+        CgroupFreezeFormat cgroup_freeze_format = 4005;
+        CgroupNotifyFrozenFormat cgroup_notify_frozen_format = 4006;
+        CgroupNotifyPopulatedFormat cgroup_notify_populated_format = 4007;
+        CgroupUnfreezeFormat cgroup_unfreeze_format = 4008;
+        F2fsSyncFileEnterFormat f2fs_sync_file_enter_format = 4009;
+        F2fsSyncFileExitFormat f2fs_sync_file_exit_format = 4010;
+        F2fsWriteBeginFormat f2fs_write_begin_format = 4011;
+        F2fsWriteEndFormat f2fs_write_end_format = 4012;
+        FileCheckAndAdvanceWbErrFormat file_check_and_advance_wb_err_format = 4013;
+        FilemapSetWbErrFormat filemap_set_wb_err_format = 4014;
+        MmcRequestDoneFormat mmc_request_done_format = 4015;
+        MmcRequestStartFormat mmc_request_start_format = 4016;
+        RegulatorBypassDisableFormat regulator_bypass_disable_format = 4017;
+        RegulatorBypassDisableCompleteFormat regulator_bypass_disable_complete_format = 4018;
+        RegulatorBypassEnableFormat regulator_bypass_enable_format = 4019;
+        RegulatorBypassEnableCompleteFormat regulator_bypass_enable_complete_format = 4020;
+        RegulatorDisableFormat regulator_disable_format = 4021;
+        RegulatorDisableCompleteFormat regulator_disable_complete_format = 4022;
+        RegulatorEnableFormat regulator_enable_format = 4023;
+        RegulatorEnableCompleteFormat regulator_enable_complete_format = 4024;
+        RegulatorEnableDelayFormat regulator_enable_delay_format = 4025;
+    }
+}
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/gpio.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/gpio.proto
new file mode 100755
index 0000000000000000000000000000000000000000..1410af52c24e250e5aa6434c7993537c2f918a25
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/gpio.proto
@@ -0,0 +1,34 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: gpio
+// /sys/kernel/debug/tracing/events/gpio/gpio_direction/format
+message GpioDirectionFormat {
+    uint32 gpio = 1;
+    int32 in = 2;
+    int32 err = 3;
+}
+
+// /sys/kernel/debug/tracing/events/gpio/gpio_value/format
+message GpioValueFormat {
+    uint32 gpio = 1;
+    int32 get = 2;
+    int32 value = 3;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/gpu_mem.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/gpu_mem.proto
new file mode 100755
index 0000000000000000000000000000000000000000..72543ad9f7e7bb9e95902bd3deb6e9dfb5218049
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/gpu_mem.proto
@@ -0,0 +1,27 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: gpu_mem
+// /sys/kernel/debug/tracing/events/gpu_mem/gpu_mem_total/format
+message GpuMemTotalFormat {
+    uint32 gpu_id = 1;
+    uint32 pid = 2;
+    uint64 size = 3;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/i2c.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/i2c.proto
new file mode 100755
index 0000000000000000000000000000000000000000..4f1de54988f7d1c3b06502630e09b60c4258e0b9
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/i2c.proto
@@ -0,0 +1,56 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: i2c
+// /sys/kernel/debug/tracing/events/i2c/i2c_read/format
+message I2cReadFormat {
+    int32 adapter_nr = 1;
+    uint32 msg_nr = 2;
+    uint32 addr = 3;
+    uint32 flags = 4;
+    uint32 len = 5;
+}
+
+// /sys/kernel/debug/tracing/events/i2c/i2c_reply/format
+message I2cReplyFormat {
+    int32 adapter_nr = 1;
+    uint32 msg_nr = 2;
+    uint32 addr = 3;
+    uint32 flags = 4;
+    uint32 len = 5;
+    uint32 buf = 6;
+}
+
+// /sys/kernel/debug/tracing/events/i2c/i2c_result/format
+message I2cResultFormat {
+    int32 adapter_nr = 1;
+    uint32 nr_msgs = 2;
+    int32 ret = 3;
+}
+
+// /sys/kernel/debug/tracing/events/i2c/i2c_write/format
+message I2cWriteFormat {
+    int32 adapter_nr = 1;
+    uint32 msg_nr = 2;
+    uint32 addr = 3;
+    uint32 flags = 4;
+    uint32 len = 5;
+    uint32 buf = 6;
+}
+
diff --git a/trace_streamer/sdk/demo_sdk/protos/types/plugins/mock_data/mock_plugin_result_standard.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/ipi.proto
similarity index 51%
rename from trace_streamer/sdk/demo_sdk/protos/types/plugins/mock_data/mock_plugin_result_standard.proto
rename to trace_streamer/src/protos/types/plugins/ftrace_data/default/ipi.proto
index bebfd6b87f10d2616bc88ce5567dd838f3f8364e..0eda02f6e3b3485f07125e6bfb5baa1ceb34b004 100755
--- a/trace_streamer/sdk/demo_sdk/protos/types/plugins/mock_data/mock_plugin_result_standard.proto
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/ipi.proto
@@ -1,3 +1,4 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
 // Copyright (c) 2021 Huawei Device Co., Ltd.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -10,38 +11,26 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//
 
 syntax = "proto3";
-package ForStandard;
-
-option java_package = "ohos.devtools.datasources.transport.grpc.service";
 
-message SliceObj {
-    int32 id = 1;
-    string name = 2;
-}
+option optimize_for = LITE_RUNTIME;
 
-message SliceInfo {
-    int32 id = 1;
-    int32 value = 2;
-    uint64 start_time = 3;
-    uint64 end_time = 4;
+// category: ipi
+// /sys/kernel/debug/tracing/events/ipi/ipi_entry/format
+message IpiEntryFormat {
+    string reason = 1;
 }
 
-message CounterObj {
-    int32 id = 1;
-    string name = 2;
+// /sys/kernel/debug/tracing/events/ipi/ipi_exit/format
+message IpiExitFormat {
+    string reason = 1;
 }
 
-message CounterInfo {
-    int32 key = 1;
-    int32 value = 2;
-    uint64 ts = 3;
+// /sys/kernel/debug/tracing/events/ipi/ipi_raise/format
+message IpiRaiseFormat {
+    uint64 target_cpus = 1;
+    string reason = 2;
 }
 
-message MockData {
-    repeated CounterObj counterobj = 1;
-    repeated CounterInfo counterinfo = 2;
-    repeated SliceObj sliceobj = 3;
-    repeated SliceInfo sliceinfo = 4;
-}
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/irq.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/irq.proto
new file mode 100755
index 0000000000000000000000000000000000000000..1e3ce1afebc69cd764ddb991914090168d3b79e1
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/irq.proto
@@ -0,0 +1,47 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: irq
+// /sys/kernel/debug/tracing/events/irq/irq_handler_entry/format
+message IrqHandlerEntryFormat {
+    int32 irq = 1;
+    string name = 2;
+}
+
+// /sys/kernel/debug/tracing/events/irq/irq_handler_exit/format
+message IrqHandlerExitFormat {
+    int32 irq = 1;
+    int32 ret = 2;
+}
+
+// /sys/kernel/debug/tracing/events/irq/softirq_entry/format
+message SoftirqEntryFormat {
+    uint32 vec = 1;
+}
+
+// /sys/kernel/debug/tracing/events/irq/softirq_exit/format
+message SoftirqExitFormat {
+    uint32 vec = 1;
+}
+
+// /sys/kernel/debug/tracing/events/irq/softirq_raise/format
+message SoftirqRaiseFormat {
+    uint32 vec = 1;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/kmem.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/kmem.proto
new file mode 100755
index 0000000000000000000000000000000000000000..f42f27c9011ae9fab391043cd1c4e9d6ea4eeeaf
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/kmem.proto
@@ -0,0 +1,121 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: kmem
+// /sys/kernel/debug/tracing/events/kmem/kfree/format
+message KfreeFormat {
+    uint64 call_site = 1;
+    uint64 ptr = 2;
+}
+
+// /sys/kernel/debug/tracing/events/kmem/kmalloc/format
+message KmallocFormat {
+    uint64 call_site = 1;
+    uint64 ptr = 2;
+    uint64 bytes_req = 3;
+    uint64 bytes_alloc = 4;
+    uint32 gfp_flags = 5;
+}
+
+// /sys/kernel/debug/tracing/events/kmem/kmalloc_node/format
+message KmallocNodeFormat {
+    uint64 call_site = 1;
+    uint64 ptr = 2;
+    uint64 bytes_req = 3;
+    uint64 bytes_alloc = 4;
+    uint32 gfp_flags = 5;
+    int32 node = 6;
+}
+
+// /sys/kernel/debug/tracing/events/kmem/kmem_cache_alloc/format
+message KmemCacheAllocFormat {
+    uint64 call_site = 1;
+    uint64 ptr = 2;
+    uint64 bytes_req = 3;
+    uint64 bytes_alloc = 4;
+    uint32 gfp_flags = 5;
+}
+
+// /sys/kernel/debug/tracing/events/kmem/kmem_cache_alloc_node/format
+message KmemCacheAllocNodeFormat {
+    uint64 call_site = 1;
+    uint64 ptr = 2;
+    uint64 bytes_req = 3;
+    uint64 bytes_alloc = 4;
+    uint32 gfp_flags = 5;
+    int32 node = 6;
+}
+
+// /sys/kernel/debug/tracing/events/kmem/kmem_cache_free/format
+message KmemCacheFreeFormat {
+    uint64 call_site = 1;
+    uint64 ptr = 2;
+}
+
+// /sys/kernel/debug/tracing/events/kmem/mm_page_alloc/format
+message MmPageAllocFormat {
+    uint64 pfn = 1;
+    uint32 order = 2;
+    uint32 gfp_flags = 3;
+    int32 migratetype = 4;
+}
+
+// /sys/kernel/debug/tracing/events/kmem/mm_page_alloc_extfrag/format
+message MmPageAllocExtfragFormat {
+    uint64 pfn = 1;
+    int32 alloc_order = 2;
+    int32 fallback_order = 3;
+    int32 alloc_migratetype = 4;
+    int32 fallback_migratetype = 5;
+    int32 change_ownership = 6;
+}
+
+// /sys/kernel/debug/tracing/events/kmem/mm_page_alloc_zone_locked/format
+message MmPageAllocZoneLockedFormat {
+    uint64 pfn = 1;
+    uint32 order = 2;
+    int32 migratetype = 3;
+}
+
+// /sys/kernel/debug/tracing/events/kmem/mm_page_free/format
+message MmPageFreeFormat {
+    uint64 pfn = 1;
+    uint32 order = 2;
+}
+
+// /sys/kernel/debug/tracing/events/kmem/mm_page_free_batched/format
+message MmPageFreeBatchedFormat {
+    uint64 pfn = 1;
+}
+
+// /sys/kernel/debug/tracing/events/kmem/mm_page_pcpu_drain/format
+message MmPagePcpuDrainFormat {
+    uint64 pfn = 1;
+    uint32 order = 2;
+    int32 migratetype = 3;
+}
+
+// /sys/kernel/debug/tracing/events/kmem/rss_stat/format
+message RssStatFormat {
+    uint32 mm_id = 1;
+    uint32 curr = 2;
+    int32 member = 3;
+    uint64 size = 4;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/mmc.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/mmc.proto
new file mode 100644
index 0000000000000000000000000000000000000000..36e890fdfe5bc535f02cf0608f91c7ad2bc6ad86
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/mmc.proto
@@ -0,0 +1,76 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: mmc
+// /sys/kernel/debug/tracing/events/mmc/mmc_request_done/format
+message MmcRequestDoneFormat {
+    uint32 cmd_opcode = 1;
+    int32 cmd_err = 2;
+    string cmd_resp = 3;
+    uint32 cmd_retries = 4;
+    uint32 stop_opcode = 5;
+    int32 stop_err = 6;
+    string stop_resp = 7;
+    uint32 stop_retries = 8;
+    uint32 sbc_opcode = 9;
+    int32 sbc_err = 10;
+    string sbc_resp = 11;
+    uint32 sbc_retries = 12;
+    uint32 bytes_xfered = 13;
+    int32 data_err = 14;
+    int32 tag = 15;
+    uint32 can_retune = 16;
+    uint32 doing_retune = 17;
+    uint32 retune_now = 18;
+    int32 need_retune = 19;
+    int32 hold_retune = 20;
+    uint32 retune_period = 21;
+    uint64 mrq = 22;
+    string name = 23;
+}
+
+// /sys/kernel/debug/tracing/events/mmc/mmc_request_start/format
+message MmcRequestStartFormat {
+    uint32 cmd_opcode = 1;
+    uint32 cmd_arg = 2;
+    uint32 cmd_flags = 3;
+    uint32 cmd_retries = 4;
+    uint32 stop_opcode = 5;
+    uint32 stop_arg = 6;
+    uint32 stop_flags = 7;
+    uint32 stop_retries = 8;
+    uint32 sbc_opcode = 9;
+    uint32 sbc_arg = 10;
+    uint32 sbc_flags = 11;
+    uint32 sbc_retries = 12;
+    uint32 blocks = 13;
+    uint32 blk_addr = 14;
+    uint32 blksz = 15;
+    uint32 data_flags = 16;
+    int32 tag = 17;
+    uint32 can_retune = 18;
+    uint32 doing_retune = 19;
+    uint32 retune_now = 20;
+    int32 need_retune = 21;
+    int32 hold_retune = 22;
+    uint32 retune_period = 23;
+    uint64 mrq = 24;
+    string name = 25;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/net.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/net.proto
new file mode 100755
index 0000000000000000000000000000000000000000..c4b3c31fcf7a647765843c4d694dde9ace41f7fb
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/net.proto
@@ -0,0 +1,185 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: net
+// /sys/kernel/debug/tracing/events/net/napi_gro_frags_entry/format
+message NapiGroFragsEntryFormat {
+    string name = 1;
+    uint32 napi_id = 2;
+    uint32 queue_mapping = 3;
+    uint64 skbaddr = 4;
+    uint32 vlan_tagged = 5;
+    uint32 vlan_proto = 6;
+    uint32 vlan_tci = 7;
+    uint32 protocol = 8;
+    uint32 ip_summed = 9;
+    uint32 hash = 10;
+    uint32 l4_hash = 11;
+    uint32 len = 12;
+    uint32 data_len = 13;
+    uint32 truesize = 14;
+    uint32 mac_header_valid = 15;
+    int32 mac_header = 16;
+    uint32 nr_frags = 17;
+    uint32 gso_size = 18;
+    uint32 gso_type = 19;
+}
+
+// /sys/kernel/debug/tracing/events/net/napi_gro_receive_entry/format
+message NapiGroReceiveEntryFormat {
+    string name = 1;
+    uint32 napi_id = 2;
+    uint32 queue_mapping = 3;
+    uint64 skbaddr = 4;
+    uint32 vlan_tagged = 5;
+    uint32 vlan_proto = 6;
+    uint32 vlan_tci = 7;
+    uint32 protocol = 8;
+    uint32 ip_summed = 9;
+    uint32 hash = 10;
+    uint32 l4_hash = 11;
+    uint32 len = 12;
+    uint32 data_len = 13;
+    uint32 truesize = 14;
+    uint32 mac_header_valid = 15;
+    int32 mac_header = 16;
+    uint32 nr_frags = 17;
+    uint32 gso_size = 18;
+    uint32 gso_type = 19;
+}
+
+// /sys/kernel/debug/tracing/events/net/net_dev_queue/format
+message NetDevQueueFormat {
+    uint64 skbaddr = 1;
+    uint32 len = 2;
+    string name = 3;
+}
+
+// /sys/kernel/debug/tracing/events/net/net_dev_start_xmit/format
+message NetDevStartXmitFormat {
+    string name = 1;
+    uint32 queue_mapping = 2;
+    uint64 skbaddr = 3;
+    uint32 vlan_tagged = 4;
+    uint32 vlan_proto = 5;
+    uint32 vlan_tci = 6;
+    uint32 protocol = 7;
+    uint32 ip_summed = 8;
+    uint32 len = 9;
+    uint32 data_len = 10;
+    int32 network_offset = 11;
+    uint32 transport_offset_valid = 12;
+    int32 transport_offset = 13;
+    uint32 tx_flags = 14;
+    uint32 gso_size = 15;
+    uint32 gso_segs = 16;
+    uint32 gso_type = 17;
+}
+
+// /sys/kernel/debug/tracing/events/net/net_dev_xmit/format
+message NetDevXmitFormat {
+    uint64 skbaddr = 1;
+    uint32 len = 2;
+    int32 rc = 3;
+    string name = 4;
+}
+
+// /sys/kernel/debug/tracing/events/net/netif_receive_skb/format
+message NetifReceiveSkbFormat {
+    uint64 skbaddr = 1;
+    uint32 len = 2;
+    string name = 3;
+}
+
+// /sys/kernel/debug/tracing/events/net/netif_receive_skb_entry/format
+message NetifReceiveSkbEntryFormat {
+    string name = 1;
+    uint32 napi_id = 2;
+    uint32 queue_mapping = 3;
+    uint64 skbaddr = 4;
+    uint32 vlan_tagged = 5;
+    uint32 vlan_proto = 6;
+    uint32 vlan_tci = 7;
+    uint32 protocol = 8;
+    uint32 ip_summed = 9;
+    uint32 hash = 10;
+    uint32 l4_hash = 11;
+    uint32 len = 12;
+    uint32 data_len = 13;
+    uint32 truesize = 14;
+    uint32 mac_header_valid = 15;
+    int32 mac_header = 16;
+    uint32 nr_frags = 17;
+    uint32 gso_size = 18;
+    uint32 gso_type = 19;
+}
+
+// /sys/kernel/debug/tracing/events/net/netif_rx/format
+message NetifRxFormat {
+    uint64 skbaddr = 1;
+    uint32 len = 2;
+    string name = 3;
+}
+
+// /sys/kernel/debug/tracing/events/net/netif_rx_entry/format
+message NetifRxEntryFormat {
+    string name = 1;
+    uint32 napi_id = 2;
+    uint32 queue_mapping = 3;
+    uint64 skbaddr = 4;
+    uint32 vlan_tagged = 5;
+    uint32 vlan_proto = 6;
+    uint32 vlan_tci = 7;
+    uint32 protocol = 8;
+    uint32 ip_summed = 9;
+    uint32 hash = 10;
+    uint32 l4_hash = 11;
+    uint32 len = 12;
+    uint32 data_len = 13;
+    uint32 truesize = 14;
+    uint32 mac_header_valid = 15;
+    int32 mac_header = 16;
+    uint32 nr_frags = 17;
+    uint32 gso_size = 18;
+    uint32 gso_type = 19;
+}
+
+// /sys/kernel/debug/tracing/events/net/netif_rx_ni_entry/format
+message NetifRxNiEntryFormat {
+    string name = 1;
+    uint32 napi_id = 2;
+    uint32 queue_mapping = 3;
+    uint64 skbaddr = 4;
+    uint32 vlan_tagged = 5;
+    uint32 vlan_proto = 6;
+    uint32 vlan_tci = 7;
+    uint32 protocol = 8;
+    uint32 ip_summed = 9;
+    uint32 hash = 10;
+    uint32 l4_hash = 11;
+    uint32 len = 12;
+    uint32 data_len = 13;
+    uint32 truesize = 14;
+    uint32 mac_header_valid = 15;
+    int32 mac_header = 16;
+    uint32 nr_frags = 17;
+    uint32 gso_size = 18;
+    uint32 gso_type = 19;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/oom.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/oom.proto
new file mode 100755
index 0000000000000000000000000000000000000000..d7b6b9c60bb8b17f279c158396f78af802d5bdcc
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/oom.proto
@@ -0,0 +1,27 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: oom
+// /sys/kernel/debug/tracing/events/oom/oom_score_adj_update/format
+message OomScoreAdjUpdateFormat {
+    int32 pid = 1;
+    string comm = 2;
+    int32 oom_score_adj = 3;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/pagemap.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/pagemap.proto
new file mode 100755
index 0000000000000000000000000000000000000000..c931e12f275aead37148fc5395a94829b4d2153b
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/pagemap.proto
@@ -0,0 +1,34 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: pagemap
+// /sys/kernel/debug/tracing/events/pagemap/mm_lru_activate/format
+message MmLruActivateFormat {
+    uint64 page = 1;
+    uint64 pfn = 2;
+}
+
+// /sys/kernel/debug/tracing/events/pagemap/mm_lru_insertion/format
+message MmLruInsertionFormat {
+    uint64 page = 1;
+    uint64 pfn = 2;
+    int32 lru = 3;
+    uint64 flags = 4;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/power.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/power.proto
new file mode 100755
index 0000000000000000000000000000000000000000..3a223d1b3d640688eef81982287ec3fb99ba43dd
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/power.proto
@@ -0,0 +1,175 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: power
+// /sys/kernel/debug/tracing/events/power/clock_disable/format
+message ClockDisableFormat {
+    string name = 1;
+    uint64 state = 2;
+    uint64 cpu_id = 3;
+}
+
+// /sys/kernel/debug/tracing/events/power/clock_enable/format
+message ClockEnableFormat {
+    string name = 1;
+    uint64 state = 2;
+    uint64 cpu_id = 3;
+}
+
+// /sys/kernel/debug/tracing/events/power/clock_set_rate/format
+message ClockSetRateFormat {
+    string name = 1;
+    uint64 state = 2;
+    uint64 cpu_id = 3;
+}
+
+// /sys/kernel/debug/tracing/events/power/cpu_frequency/format
+message CpuFrequencyFormat {
+    uint32 state = 1;
+    uint32 cpu_id = 2;
+}
+
+// /sys/kernel/debug/tracing/events/power/cpu_frequency_limits/format
+message CpuFrequencyLimitsFormat {
+    uint32 min_freq = 1;
+    uint32 max_freq = 2;
+    uint32 cpu_id = 3;
+}
+
+// /sys/kernel/debug/tracing/events/power/cpu_idle/format
+message CpuIdleFormat {
+    uint32 state = 1;
+    uint32 cpu_id = 2;
+}
+
+// /sys/kernel/debug/tracing/events/power/dev_pm_qos_add_request/format
+message DevPmQosAddRequestFormat {
+    string name = 1;
+    uint32 type = 2;
+    int32 new_value = 3;
+}
+
+// /sys/kernel/debug/tracing/events/power/dev_pm_qos_remove_request/format
+message DevPmQosRemoveRequestFormat {
+    string name = 1;
+    uint32 type = 2;
+    int32 new_value = 3;
+}
+
+// /sys/kernel/debug/tracing/events/power/dev_pm_qos_update_request/format
+message DevPmQosUpdateRequestFormat {
+    string name = 1;
+    uint32 type = 2;
+    int32 new_value = 3;
+}
+
+// /sys/kernel/debug/tracing/events/power/device_pm_callback_end/format
+message DevicePmCallbackEndFormat {
+    string device = 1;
+    string driver = 2;
+    int32 error = 3;
+}
+
+// /sys/kernel/debug/tracing/events/power/device_pm_callback_start/format
+message DevicePmCallbackStartFormat {
+    string device = 1;
+    string driver = 2;
+    string parent = 3;
+    string pm_ops = 4;
+    int32 event = 5;
+}
+
+// /sys/kernel/debug/tracing/events/power/pm_qos_add_request/format
+message PmQosAddRequestFormat {
+    int32 pm_qos_class = 1;
+    int32 value = 2;
+}
+
+// /sys/kernel/debug/tracing/events/power/pm_qos_remove_request/format
+message PmQosRemoveRequestFormat {
+    int32 pm_qos_class = 1;
+    int32 value = 2;
+}
+
+// /sys/kernel/debug/tracing/events/power/pm_qos_update_flags/format
+message PmQosUpdateFlagsFormat {
+    uint32 action = 1;
+    int32 prev_value = 2;
+    int32 curr_value = 3;
+}
+
+// /sys/kernel/debug/tracing/events/power/pm_qos_update_request/format
+message PmQosUpdateRequestFormat {
+    int32 pm_qos_class = 1;
+    int32 value = 2;
+}
+
+// /sys/kernel/debug/tracing/events/power/pm_qos_update_request_timeout/format
+message PmQosUpdateRequestTimeoutFormat {
+    int32 pm_qos_class = 1;
+    int32 value = 2;
+    uint64 timeout_us = 3;
+}
+
+// /sys/kernel/debug/tracing/events/power/pm_qos_update_target/format
+message PmQosUpdateTargetFormat {
+    uint32 action = 1;
+    int32 prev_value = 2;
+    int32 curr_value = 3;
+}
+
+// /sys/kernel/debug/tracing/events/power/power_domain_target/format
+message PowerDomainTargetFormat {
+    string name = 1;
+    uint64 state = 2;
+    uint64 cpu_id = 3;
+}
+
+// /sys/kernel/debug/tracing/events/power/pstate_sample/format
+message PstateSampleFormat {
+    uint32 core_busy = 1;
+    uint32 scaled_busy = 2;
+    uint32 from = 3;
+    uint32 to = 4;
+    uint64 mperf = 5;
+    uint64 aperf = 6;
+    uint64 tsc = 7;
+    uint32 freq = 8;
+    uint32 io_boost = 9;
+}
+
+// /sys/kernel/debug/tracing/events/power/suspend_resume/format
+message SuspendResumeFormat {
+    string action = 1;
+    int32 val = 2;
+    uint32 start = 3;
+}
+
+// /sys/kernel/debug/tracing/events/power/wakeup_source_activate/format
+message WakeupSourceActivateFormat {
+    string name = 1;
+    uint64 state = 2;
+}
+
+// /sys/kernel/debug/tracing/events/power/wakeup_source_deactivate/format
+message WakeupSourceDeactivateFormat {
+    string name = 1;
+    uint64 state = 2;
+}
+
diff --git a/trace_streamer/sdk/demo_sdk/protos/types/plugins/mock_data/mock_plugin_config_standard.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/printk.proto
similarity index 74%
rename from trace_streamer/sdk/demo_sdk/protos/types/plugins/mock_data/mock_plugin_config_standard.proto
rename to trace_streamer/src/protos/types/plugins/ftrace_data/default/printk.proto
index 8e62d2e991387156dd257d7ef840ccc452cc0434..39be37e143ef980b271bb70391613cdd71966345 100755
--- a/trace_streamer/sdk/demo_sdk/protos/types/plugins/mock_data/mock_plugin_config_standard.proto
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/printk.proto
@@ -1,3 +1,4 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
 // Copyright (c) 2021 Huawei Device Co., Ltd.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -10,10 +11,15 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//
+
 syntax = "proto3";
-package ForStandard;
-option java_package = "ohos.devtools.datasources.transport.grpc.service";
 
-message MockConfig {
+option optimize_for = LITE_RUNTIME;
+
+// category: printk
+// /sys/kernel/debug/tracing/events/printk/console/format
+message ConsoleFormat {
     string msg = 1;
 }
+
diff --git a/trace_streamer/sdk/dubai_sdk/protos/types/plugins/mock_data/mock_plugin_result_standard.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/raw_syscalls.proto
similarity index 51%
rename from trace_streamer/sdk/dubai_sdk/protos/types/plugins/mock_data/mock_plugin_result_standard.proto
rename to trace_streamer/src/protos/types/plugins/ftrace_data/default/raw_syscalls.proto
index bebfd6b87f10d2616bc88ce5567dd838f3f8364e..2abbf1112293901eb5da3df3338926c1f11846e8 100755
--- a/trace_streamer/sdk/dubai_sdk/protos/types/plugins/mock_data/mock_plugin_result_standard.proto
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/raw_syscalls.proto
@@ -1,3 +1,4 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
 // Copyright (c) 2021 Huawei Device Co., Ltd.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -10,38 +11,22 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//
 
 syntax = "proto3";
-package ForStandard;
-
-option java_package = "ohos.devtools.datasources.transport.grpc.service";
-
-message SliceObj {
-    int32 id = 1;
-    string name = 2;
-}
 
-message SliceInfo {
-    int32 id = 1;
-    int32 value = 2;
-    uint64 start_time = 3;
-    uint64 end_time = 4;
-}
+option optimize_for = LITE_RUNTIME;
 
-message CounterObj {
-    int32 id = 1;
-    string name = 2;
+// category: raw_syscalls
+// /sys/kernel/debug/tracing/events/raw_syscalls/sys_enter/format
+message SysEnterFormat {
+    uint64 id = 1;
+    repeated uint64 args = 2;
 }
 
-message CounterInfo {
-    int32 key = 1;
-    int32 value = 2;
-    uint64 ts = 3;
+// /sys/kernel/debug/tracing/events/raw_syscalls/sys_exit/format
+message SysExitFormat {
+    uint64 id = 1;
+    uint64 ret = 2;
 }
 
-message MockData {
-    repeated CounterObj counterobj = 1;
-    repeated CounterInfo counterinfo = 2;
-    repeated SliceObj sliceobj = 3;
-    repeated SliceInfo sliceinfo = 4;
-}
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/rcu.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/rcu.proto
new file mode 100755
index 0000000000000000000000000000000000000000..5448d1e605bf867d5745d8aff4b391622b909490
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/rcu.proto
@@ -0,0 +1,25 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: rcu
+// /sys/kernel/debug/tracing/events/rcu/rcu_utilization/format
+message RcuUtilizationFormat {
+    string s = 1;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/regulator.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/regulator.proto
new file mode 100644
index 0000000000000000000000000000000000000000..5fa5d6534aa3a29a4af9fa51519f2936cbf3fc90
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/regulator.proto
@@ -0,0 +1,78 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: regulator
+// /sys/kernel/debug/tracing/events/regulator/regulator_bypass_disable/format
+message RegulatorBypassDisableFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/regulator/regulator_bypass_disable_complete/format
+message RegulatorBypassDisableCompleteFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/regulator/regulator_bypass_enable/format
+message RegulatorBypassEnableFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/regulator/regulator_bypass_enable_complete/format
+message RegulatorBypassEnableCompleteFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/regulator/regulator_disable/format
+message RegulatorDisableFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/regulator/regulator_disable_complete/format
+message RegulatorDisableCompleteFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/regulator/regulator_enable/format
+message RegulatorEnableFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/regulator/regulator_enable_complete/format
+message RegulatorEnableCompleteFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/regulator/regulator_enable_delay/format
+message RegulatorEnableDelayFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/regulator/regulator_set_voltage/format
+message RegulatorSetVoltageFormat {
+    string name = 1;
+    int32 min = 2;
+    int32 max = 3;
+}
+
+// /sys/kernel/debug/tracing/events/regulator/regulator_set_voltage_complete/format
+message RegulatorSetVoltageCompleteFormat {
+    string name = 1;
+    uint32 val = 2;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/sched.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/sched.proto
new file mode 100755
index 0000000000000000000000000000000000000000..7af27b8184df94a4cd55b559435573fb5ad26f16
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/sched.proto
@@ -0,0 +1,213 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: sched
+// /sys/kernel/debug/tracing/events/sched/sched_blocked_reason/format
+message SchedBlockedReasonFormat {
+    int32 pid = 1;
+    uint64 caller = 2;
+    uint32 io_wait = 3;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_kthread_stop/format
+message SchedKthreadStopFormat {
+    string comm = 1;
+    int32 pid = 2;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_kthread_stop_ret/format
+message SchedKthreadStopRetFormat {
+    int32 ret = 1;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_migrate_task/format
+message SchedMigrateTaskFormat {
+    string comm = 1;
+    int32 pid = 2;
+    int32 prio = 3;
+    int32 orig_cpu = 4;
+    int32 dest_cpu = 5;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_move_numa/format
+message SchedMoveNumaFormat {
+    int32 pid = 1;
+    int32 tgid = 2;
+    int32 ngid = 3;
+    int32 src_cpu = 4;
+    int32 src_nid = 5;
+    int32 dst_cpu = 6;
+    int32 dst_nid = 7;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_pi_setprio/format
+message SchedPiSetprioFormat {
+    string comm = 1;
+    int32 pid = 2;
+    int32 oldprio = 3;
+    int32 newprio = 4;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_process_exec/format
+message SchedProcessExecFormat {
+    string filename = 1;
+    int32 pid = 2;
+    int32 old_pid = 3;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_process_exit/format
+message SchedProcessExitFormat {
+    string comm = 1;
+    int32 pid = 2;
+    int32 prio = 3;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_process_fork/format
+message SchedProcessForkFormat {
+    string parent_comm = 1;
+    int32 parent_pid = 2;
+    string child_comm = 3;
+    int32 child_pid = 4;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_process_free/format
+message SchedProcessFreeFormat {
+    string comm = 1;
+    int32 pid = 2;
+    int32 prio = 3;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_process_wait/format
+message SchedProcessWaitFormat {
+    string comm = 1;
+    int32 pid = 2;
+    int32 prio = 3;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_stat_blocked/format
+message SchedStatBlockedFormat {
+    string comm = 1;
+    int32 pid = 2;
+    uint64 delay = 3;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_stat_iowait/format
+message SchedStatIowaitFormat {
+    string comm = 1;
+    int32 pid = 2;
+    uint64 delay = 3;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_stat_runtime/format
+message SchedStatRuntimeFormat {
+    string comm = 1;
+    int32 pid = 2;
+    uint64 runtime = 3;
+    uint64 vruntime = 4;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_stat_sleep/format
+message SchedStatSleepFormat {
+    string comm = 1;
+    int32 pid = 2;
+    uint64 delay = 3;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_stat_wait/format
+message SchedStatWaitFormat {
+    string comm = 1;
+    int32 pid = 2;
+    uint64 delay = 3;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_stick_numa/format
+message SchedStickNumaFormat {
+    int32 pid = 1;
+    int32 tgid = 2;
+    int32 ngid = 3;
+    int32 src_cpu = 4;
+    int32 src_nid = 5;
+    int32 dst_cpu = 6;
+    int32 dst_nid = 7;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_swap_numa/format
+message SchedSwapNumaFormat {
+    int32 src_pid = 1;
+    int32 src_tgid = 2;
+    int32 src_ngid = 3;
+    int32 src_cpu = 4;
+    int32 src_nid = 5;
+    int32 dst_pid = 6;
+    int32 dst_tgid = 7;
+    int32 dst_ngid = 8;
+    int32 dst_cpu = 9;
+    int32 dst_nid = 10;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_switch/format
+message SchedSwitchFormat {
+    string prev_comm = 1;
+    int32 prev_pid = 2;
+    int32 prev_prio = 3;
+    uint64 prev_state = 4;
+    string next_comm = 5;
+    int32 next_pid = 6;
+    int32 next_prio = 7;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_wait_task/format
+message SchedWaitTaskFormat {
+    string comm = 1;
+    int32 pid = 2;
+    int32 prio = 3;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_wake_idle_without_ipi/format
+message SchedWakeIdleWithoutIpiFormat {
+    int32 cpu = 1;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_wakeup/format
+message SchedWakeupFormat {
+    string comm = 1;
+    int32 pid = 2;
+    int32 prio = 3;
+    int32 success = 4;
+    int32 target_cpu = 5;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_wakeup_new/format
+message SchedWakeupNewFormat {
+    string comm = 1;
+    int32 pid = 2;
+    int32 prio = 3;
+    int32 success = 4;
+    int32 target_cpu = 5;
+}
+
+// /sys/kernel/debug/tracing/events/sched/sched_waking/format
+message SchedWakingFormat {
+    string comm = 1;
+    int32 pid = 2;
+    int32 prio = 3;
+    int32 success = 4;
+    int32 target_cpu = 5;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/signal.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/signal.proto
new file mode 100755
index 0000000000000000000000000000000000000000..01246e67df9f2004cd132d2b688a5de74174bae5
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/signal.proto
@@ -0,0 +1,40 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: signal
+// /sys/kernel/debug/tracing/events/signal/signal_deliver/format
+message SignalDeliverFormat {
+    int32 sig = 1;
+    int32 error_code = 2;
+    int32 code = 3;
+    uint64 sig_handler = 4;
+    uint64 sig_flags = 5;
+}
+
+// /sys/kernel/debug/tracing/events/signal/signal_generate/format
+message SignalGenerateFormat {
+    int32 sig = 1;
+    int32 error_code = 2;
+    int32 code = 3;
+    string comm = 4;
+    int32 pid = 5;
+    int32 group = 6;
+    int32 result = 7;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/sunrpc.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/sunrpc.proto
new file mode 100755
index 0000000000000000000000000000000000000000..35c4f67cb56077b32598918dd8dbede5dd329c4c
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/sunrpc.proto
@@ -0,0 +1,247 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: sunrpc
+// /sys/kernel/debug/tracing/events/sunrpc/rpc_bind_status/format
+message RpcBindStatusFormat {
+    uint32 task_id = 1;
+    uint32 client_id = 2;
+    int32 status = 3;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/rpc_call_status/format
+message RpcCallStatusFormat {
+    uint32 task_id = 1;
+    uint32 client_id = 2;
+    int32 status = 3;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/rpc_connect_status/format
+message RpcConnectStatusFormat {
+    uint32 task_id = 1;
+    uint32 client_id = 2;
+    int32 status = 3;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/rpc_socket_close/format
+message RpcSocketCloseFormat {
+    uint32 socket_state = 1;
+    uint32 sock_state = 2;
+    uint64 ino = 3;
+    string dstaddr = 4;
+    string dstport = 5;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/rpc_socket_connect/format
+message RpcSocketConnectFormat {
+    int32 error = 1;
+    uint32 socket_state = 2;
+    uint32 sock_state = 3;
+    uint64 ino = 4;
+    string dstaddr = 5;
+    string dstport = 6;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/rpc_socket_error/format
+message RpcSocketErrorFormat {
+    int32 error = 1;
+    uint32 socket_state = 2;
+    uint32 sock_state = 3;
+    uint64 ino = 4;
+    string dstaddr = 5;
+    string dstport = 6;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/rpc_socket_reset_connection/format
+message RpcSocketResetConnectionFormat {
+    int32 error = 1;
+    uint32 socket_state = 2;
+    uint32 sock_state = 3;
+    uint64 ino = 4;
+    string dstaddr = 5;
+    string dstport = 6;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/rpc_socket_shutdown/format
+message RpcSocketShutdownFormat {
+    uint32 socket_state = 1;
+    uint32 sock_state = 2;
+    uint64 ino = 3;
+    string dstaddr = 4;
+    string dstport = 5;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/rpc_socket_state_change/format
+message RpcSocketStateChangeFormat {
+    uint32 socket_state = 1;
+    uint32 sock_state = 2;
+    uint64 ino = 3;
+    string dstaddr = 4;
+    string dstport = 5;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/rpc_task_begin/format
+message RpcTaskBeginFormat {
+    uint32 task_id = 1;
+    uint32 client_id = 2;
+    uint64 action = 3;
+    uint64 runstate = 4;
+    int32 status = 5;
+    uint32 flags = 6;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/rpc_task_complete/format
+message RpcTaskCompleteFormat {
+    uint32 task_id = 1;
+    uint32 client_id = 2;
+    uint64 action = 3;
+    uint64 runstate = 4;
+    int32 status = 5;
+    uint32 flags = 6;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/rpc_task_run_action/format
+message RpcTaskRunActionFormat {
+    uint32 task_id = 1;
+    uint32 client_id = 2;
+    uint64 action = 3;
+    uint64 runstate = 4;
+    int32 status = 5;
+    uint32 flags = 6;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/rpc_task_sleep/format
+message RpcTaskSleepFormat {
+    uint32 task_id = 1;
+    uint32 client_id = 2;
+    uint64 timeout = 3;
+    uint64 runstate = 4;
+    int32 status = 5;
+    uint32 flags = 6;
+    string q_name = 7;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/rpc_task_wakeup/format
+message RpcTaskWakeupFormat {
+    uint32 task_id = 1;
+    uint32 client_id = 2;
+    uint64 timeout = 3;
+    uint64 runstate = 4;
+    int32 status = 5;
+    uint32 flags = 6;
+    string q_name = 7;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/svc_handle_xprt/format
+message SvcHandleXprtFormat {
+    uint64 xprt = 1;
+    int32 len = 2;
+    uint64 flags = 3;
+    string addr = 4;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/svc_process/format
+message SvcProcessFormat {
+    uint32 xid = 1;
+    uint32 vers = 2;
+    uint32 proc = 3;
+    string service = 4;
+    string addr = 5;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/svc_recv/format
+message SvcRecvFormat {
+    uint32 xid = 1;
+    int32 len = 2;
+    uint64 flags = 3;
+    string addr = 4;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/svc_send/format
+message SvcSendFormat {
+    uint32 xid = 1;
+    int32 status = 2;
+    uint64 flags = 3;
+    string addr = 4;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/svc_wake_up/format
+message SvcWakeUpFormat {
+    int32 pid = 1;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/svc_xprt_dequeue/format
+message SvcXprtDequeueFormat {
+    uint64 xprt = 1;
+    uint64 flags = 2;
+    uint64 wakeup = 3;
+    string addr = 4;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/svc_xprt_do_enqueue/format
+message SvcXprtDoEnqueueFormat {
+    uint64 xprt = 1;
+    int32 pid = 2;
+    uint64 flags = 3;
+    string addr = 4;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/xprt_complete_rqst/format
+message XprtCompleteRqstFormat {
+    uint32 xid = 1;
+    int32 status = 2;
+    string addr = 3;
+    string port = 4;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/xprt_lookup_rqst/format
+message XprtLookupRqstFormat {
+    uint32 xid = 1;
+    int32 status = 2;
+    string addr = 3;
+    string port = 4;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/xprt_transmit/format
+message XprtTransmitFormat {
+    uint32 xid = 1;
+    int32 status = 2;
+    string addr = 3;
+    string port = 4;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/xs_tcp_data_ready/format
+message XsTcpDataReadyFormat {
+    int32 err = 1;
+    uint32 total = 2;
+    string addr = 3;
+    string port = 4;
+}
+
+// /sys/kernel/debug/tracing/events/sunrpc/xs_tcp_data_recv/format
+message XsTcpDataRecvFormat {
+    string addr = 1;
+    string port = 2;
+    uint32 xid = 3;
+    uint64 flags = 4;
+    uint64 copied = 5;
+    uint32 reclen = 6;
+    uint64 offset = 7;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/task.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/task.proto
new file mode 100755
index 0000000000000000000000000000000000000000..82177f60b5bd3e1d62077d63627490c360280624
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/task.proto
@@ -0,0 +1,36 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: task
+// /sys/kernel/debug/tracing/events/task/task_newtask/format
+message TaskNewtaskFormat {
+    int32 pid = 1;
+    string comm = 2;
+    uint64 clone_flags = 3;
+    int32 oom_score_adj = 4;
+}
+
+// /sys/kernel/debug/tracing/events/task/task_rename/format
+message TaskRenameFormat {
+    int32 pid = 1;
+    string oldcomm = 2;
+    string newcomm = 3;
+    int32 oom_score_adj = 4;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/timer.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/timer.proto
new file mode 100755
index 0000000000000000000000000000000000000000..d85b207f4e7532ea457dbc8b054fd594115c513c
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/timer.proto
@@ -0,0 +1,101 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: timer
+// /sys/kernel/debug/tracing/events/timer/hrtimer_cancel/format
+message HrtimerCancelFormat {
+    uint64 hrtimer = 1;
+}
+
+// /sys/kernel/debug/tracing/events/timer/hrtimer_expire_entry/format
+message HrtimerExpireEntryFormat {
+    uint64 hrtimer = 1;
+    int64 now = 2;
+    uint64 function = 3;
+}
+
+// /sys/kernel/debug/tracing/events/timer/hrtimer_expire_exit/format
+message HrtimerExpireExitFormat {
+    uint64 hrtimer = 1;
+}
+
+// /sys/kernel/debug/tracing/events/timer/hrtimer_init/format
+message HrtimerInitFormat {
+    uint64 hrtimer = 1;
+    int32 clockid = 2;
+    uint32 mode = 3;
+}
+
+// /sys/kernel/debug/tracing/events/timer/hrtimer_start/format
+message HrtimerStartFormat {
+    uint64 hrtimer = 1;
+    uint64 function = 2;
+    int64 expires = 3;
+    int64 softexpires = 4;
+    uint32 mode = 5;
+}
+
+// /sys/kernel/debug/tracing/events/timer/itimer_expire/format
+message ItimerExpireFormat {
+    int32 which = 1;
+    int32 pid = 2;
+    uint64 now = 3;
+}
+
+// /sys/kernel/debug/tracing/events/timer/itimer_state/format
+message ItimerStateFormat {
+    int32 which = 1;
+    uint64 expires = 2;
+    uint64 value_sec = 3;
+    uint64 value_usec = 4;
+    uint64 interval_sec = 5;
+    uint64 interval_usec = 6;
+}
+
+// /sys/kernel/debug/tracing/events/timer/timer_cancel/format
+message TimerCancelFormat {
+    uint64 timer = 1;
+}
+
+// /sys/kernel/debug/tracing/events/timer/timer_expire_entry/format
+message TimerExpireEntryFormat {
+    uint64 timer = 1;
+    uint64 now = 2;
+    uint64 function = 3;
+}
+
+// /sys/kernel/debug/tracing/events/timer/timer_expire_exit/format
+message TimerExpireExitFormat {
+    uint64 timer = 1;
+}
+
+// /sys/kernel/debug/tracing/events/timer/timer_init/format
+message TimerInitFormat {
+    uint64 timer = 1;
+}
+
+// /sys/kernel/debug/tracing/events/timer/timer_start/format
+message TimerStartFormat {
+    uint64 timer = 1;
+    uint64 function = 2;
+    uint64 expires = 3;
+    uint64 now = 4;
+    uint32 flags = 5;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/trace_plugin_config.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/trace_plugin_config.proto
new file mode 100755
index 0000000000000000000000000000000000000000..825b14a8a98af5a2d299951f1be3ddcca5dc6d2a
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/trace_plugin_config.proto
@@ -0,0 +1,32 @@
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+option optimize_for = LITE_RUNTIME;
+
+message TracePluginConfig {
+  repeated string ftrace_events = 1; // kernel event set
+  repeated string hitrace_categories = 2; // hitrace event set
+  repeated string hitrace_apps = 3; // hitrace app set
+  uint32 buffer_size_kb = 4;    // kernel trace buffer size
+  uint32 flush_interval_ms = 5; // time interval in milliseconds to notify service process
+  uint32 flush_threshold_kb = 6; // buffer water mark threshold to notify service process
+  bool parse_ksyms = 7;  // parse /proc/kallsyms or not
+  string clock = 8;      // value for trace_clock
+  uint32 trace_period_ms = 10; // time interval in milliseconds to read kernel trace buffer
+  string raw_data_prefix = 13; // raw data file prefix for debug
+  uint32 trace_duration_ms = 20; // time duration in millisconds for trace actions
+  bool debug_on = 30; // enable debug options
+  bool discard_cache_data = 31; // if set true, session will stop immediately.(cache data will be lost)
+  uint32 hitrace_time = 32;
+}
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/trace_plugin_result.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/trace_plugin_result.proto
new file mode 100755
index 0000000000000000000000000000000000000000..96476feea7211c28e737ede7ec903f924075ac86
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/trace_plugin_result.proto
@@ -0,0 +1,80 @@
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+import "ftrace_event.proto";
+
+option optimize_for = LITE_RUNTIME;
+
+message TracePluginResult {
+  repeated FtraceCpuStatsMsg ftrace_cpu_stats = 1;
+  repeated FtraceCpuDetailMsg ftrace_cpu_detail = 2;
+  repeated SymbolsDetailMsg symbols_detail = 5;
+  repeated ClockDetailMsg clocks_detail = 6;
+}
+
+message ClockDetailMsg {
+  // man clock_gettime
+  enum ClockId {
+    UNKNOW = 0;
+    BOOTTIME = 1;
+    REALTIME = 2;
+    REALTIME_COARSE = 3;
+    MONOTONIC = 4;
+    MONOTONIC_COARSE = 5;
+    MONOTONIC_RAW = 6;
+  }
+  ClockId id = 1;
+  message TimeSpec {
+    uint32 tv_sec = 1;
+    uint32 tv_nsec = 2;
+  };
+  TimeSpec time = 2;
+  TimeSpec resolution = 3;
+};
+
+message SymbolsDetailMsg {
+  uint64 symbol_addr = 1; // symbol address
+  string symbol_name = 2; // symbol name
+}
+
+message FtraceCpuStatsMsg {
+  enum Status {
+    TRACE_START = 0;
+    TRACE_END = 1;
+  }
+
+  Status status = 1;
+  repeated PerCpuStatsMsg per_cpu_stats = 2;
+  string trace_clock = 3;
+}
+
+// cat /sys/kernel/debug/tracing/per_cpu/cpu0/stats
+message PerCpuStatsMsg {
+  uint64 cpu = 1;
+  uint64 entries = 2;
+  uint64 overrun = 3;
+  uint64 commit_overrun = 4;
+  uint64 bytes = 5;
+  double oldest_event_ts = 6;
+  double now_ts = 7;
+  uint64 dropped_events = 8;
+  uint64 read_events = 9;
+}
+
+message FtraceCpuDetailMsg {
+  uint32 cpu = 1;
+  repeated FtraceEvent event = 2;
+  uint64 overwrite = 3;
+}
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/v4l2.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/v4l2.proto
new file mode 100755
index 0000000000000000000000000000000000000000..7ca31b507160e8a66bd9ddeb1b485d957dcb6c50
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/v4l2.proto
@@ -0,0 +1,140 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: v4l2
+// /sys/kernel/debug/tracing/events/v4l2/v4l2_dqbuf/format
+message V4l2DqbufFormat {
+    int32 minor = 1;
+    uint32 index = 2;
+    uint32 type = 3;
+    uint32 bytesused = 4;
+    uint32 flags = 5;
+    uint32 field = 6;
+    int64 timestamp = 7;
+    uint32 timecode_type = 8;
+    uint32 timecode_flags = 9;
+    uint32 timecode_frames = 10;
+    uint32 timecode_seconds = 11;
+    uint32 timecode_minutes = 12;
+    uint32 timecode_hours = 13;
+    uint32 timecode_userbits0 = 14;
+    uint32 timecode_userbits1 = 15;
+    uint32 timecode_userbits2 = 16;
+    uint32 timecode_userbits3 = 17;
+    uint32 sequence = 18;
+}
+
+// /sys/kernel/debug/tracing/events/v4l2/v4l2_qbuf/format
+message V4l2QbufFormat {
+    int32 minor = 1;
+    uint32 index = 2;
+    uint32 type = 3;
+    uint32 bytesused = 4;
+    uint32 flags = 5;
+    uint32 field = 6;
+    int64 timestamp = 7;
+    uint32 timecode_type = 8;
+    uint32 timecode_flags = 9;
+    uint32 timecode_frames = 10;
+    uint32 timecode_seconds = 11;
+    uint32 timecode_minutes = 12;
+    uint32 timecode_hours = 13;
+    uint32 timecode_userbits0 = 14;
+    uint32 timecode_userbits1 = 15;
+    uint32 timecode_userbits2 = 16;
+    uint32 timecode_userbits3 = 17;
+    uint32 sequence = 18;
+}
+
+// /sys/kernel/debug/tracing/events/v4l2/vb2_v4l2_buf_done/format
+message Vb2V4l2BufDoneFormat {
+    int32 minor = 1;
+    uint32 flags = 2;
+    uint32 field = 3;
+    uint64 timestamp = 4;
+    uint32 timecode_type = 5;
+    uint32 timecode_flags = 6;
+    uint32 timecode_frames = 7;
+    uint32 timecode_seconds = 8;
+    uint32 timecode_minutes = 9;
+    uint32 timecode_hours = 10;
+    uint32 timecode_userbits0 = 11;
+    uint32 timecode_userbits1 = 12;
+    uint32 timecode_userbits2 = 13;
+    uint32 timecode_userbits3 = 14;
+    uint32 sequence = 15;
+}
+
+// /sys/kernel/debug/tracing/events/v4l2/vb2_v4l2_buf_queue/format
+message Vb2V4l2BufQueueFormat {
+    int32 minor = 1;
+    uint32 flags = 2;
+    uint32 field = 3;
+    uint64 timestamp = 4;
+    uint32 timecode_type = 5;
+    uint32 timecode_flags = 6;
+    uint32 timecode_frames = 7;
+    uint32 timecode_seconds = 8;
+    uint32 timecode_minutes = 9;
+    uint32 timecode_hours = 10;
+    uint32 timecode_userbits0 = 11;
+    uint32 timecode_userbits1 = 12;
+    uint32 timecode_userbits2 = 13;
+    uint32 timecode_userbits3 = 14;
+    uint32 sequence = 15;
+}
+
+// /sys/kernel/debug/tracing/events/v4l2/vb2_v4l2_dqbuf/format
+message Vb2V4l2DqbufFormat {
+    int32 minor = 1;
+    uint32 flags = 2;
+    uint32 field = 3;
+    uint64 timestamp = 4;
+    uint32 timecode_type = 5;
+    uint32 timecode_flags = 6;
+    uint32 timecode_frames = 7;
+    uint32 timecode_seconds = 8;
+    uint32 timecode_minutes = 9;
+    uint32 timecode_hours = 10;
+    uint32 timecode_userbits0 = 11;
+    uint32 timecode_userbits1 = 12;
+    uint32 timecode_userbits2 = 13;
+    uint32 timecode_userbits3 = 14;
+    uint32 sequence = 15;
+}
+
+// /sys/kernel/debug/tracing/events/v4l2/vb2_v4l2_qbuf/format
+message Vb2V4l2QbufFormat {
+    int32 minor = 1;
+    uint32 flags = 2;
+    uint32 field = 3;
+    uint64 timestamp = 4;
+    uint32 timecode_type = 5;
+    uint32 timecode_flags = 6;
+    uint32 timecode_frames = 7;
+    uint32 timecode_seconds = 8;
+    uint32 timecode_minutes = 9;
+    uint32 timecode_hours = 10;
+    uint32 timecode_userbits0 = 11;
+    uint32 timecode_userbits1 = 12;
+    uint32 timecode_userbits2 = 13;
+    uint32 timecode_userbits3 = 14;
+    uint32 sequence = 15;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/vmscan.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/vmscan.proto
new file mode 100755
index 0000000000000000000000000000000000000000..c9f1867f74c298e46b96323be93926d24cf1c0d7
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/vmscan.proto
@@ -0,0 +1,111 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: vmscan
+// /sys/kernel/debug/tracing/events/vmscan/mm_shrink_slab_end/format
+message MmShrinkSlabEndFormat {
+    uint64 shr = 1;
+    int32 nid = 2;
+    uint64 shrink = 3;
+    uint64 unused_scan = 4;
+    uint64 new_scan = 5;
+    int32 retval = 6;
+    uint64 total_scan = 7;
+}
+
+// /sys/kernel/debug/tracing/events/vmscan/mm_shrink_slab_start/format
+message MmShrinkSlabStartFormat {
+    uint64 shr = 1;
+    uint64 shrink = 2;
+    int32 nid = 3;
+    uint64 nr_objects_to_shrink = 4;
+    uint32 gfp_flags = 5;
+    uint64 cache_items = 6;
+    uint64 delta = 7;
+    uint64 total_scan = 8;
+    int32 priority = 9;
+}
+
+// /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_direct_reclaim_begin/format
+message MmVmscanDirectReclaimBeginFormat {
+    int32 order = 1;
+    int32 may_writepage = 2;
+    uint32 gfp_flags = 3;
+    int32 classzone_idx = 4;
+}
+
+// /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_direct_reclaim_end/format
+message MmVmscanDirectReclaimEndFormat {
+    uint64 nr_reclaimed = 1;
+}
+
+// /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_kswapd_sleep/format
+message MmVmscanKswapdSleepFormat {
+    int32 nid = 1;
+}
+
+// /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_kswapd_wake/format
+message MmVmscanKswapdWakeFormat {
+    int32 nid = 1;
+    int32 zid = 2;
+    int32 order = 3;
+}
+
+// /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_lru_isolate/format
+message MmVmscanLruIsolateFormat {
+    int32 classzone_idx = 1;
+    int32 order = 2;
+    uint64 nr_requested = 3;
+    uint64 nr_scanned = 4;
+    uint64 nr_skipped = 5;
+    uint64 nr_taken = 6;
+    uint32 isolate_mode = 7;
+    int32 lru = 8;
+}
+
+// /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_lru_shrink_inactive/format
+message MmVmscanLruShrinkInactiveFormat {
+    int32 nid = 1;
+    uint64 nr_scanned = 2;
+    uint64 nr_reclaimed = 3;
+    uint64 nr_dirty = 4;
+    uint64 nr_writeback = 5;
+    uint64 nr_congested = 6;
+    uint64 nr_immediate = 7;
+    uint64 nr_activate = 8;
+    uint64 nr_ref_keep = 9;
+    uint64 nr_unmap_fail = 10;
+    int32 priority = 11;
+    int32 reclaim_flags = 12;
+}
+
+// /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_wakeup_kswapd/format
+message MmVmscanWakeupKswapdFormat {
+    int32 nid = 1;
+    int32 zid = 2;
+    int32 order = 3;
+    uint32 gfp_flags = 4;
+}
+
+// /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_writepage/format
+message MmVmscanWritepageFormat {
+    uint64 pfn = 1;
+    int32 reclaim_flags = 2;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/workqueue.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/workqueue.proto
new file mode 100755
index 0000000000000000000000000000000000000000..040e5abf1bfc038ee0be5ea33de0c25e4bcfd68c
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/workqueue.proto
@@ -0,0 +1,45 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: workqueue
+// /sys/kernel/debug/tracing/events/workqueue/workqueue_activate_work/format
+message WorkqueueActivateWorkFormat {
+    uint64 work = 1;
+}
+
+// /sys/kernel/debug/tracing/events/workqueue/workqueue_execute_end/format
+message WorkqueueExecuteEndFormat {
+    uint64 work = 1;
+}
+
+// /sys/kernel/debug/tracing/events/workqueue/workqueue_execute_start/format
+message WorkqueueExecuteStartFormat {
+    uint64 work = 1;
+    uint64 function = 2;
+}
+
+// /sys/kernel/debug/tracing/events/workqueue/workqueue_queue_work/format
+message WorkqueueQueueWorkFormat {
+    uint64 work = 1;
+    uint64 function = 2;
+    uint64 workqueue = 3;
+    uint32 req_cpu = 4;
+    uint32 cpu = 5;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/writeback.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/writeback.proto
new file mode 100755
index 0000000000000000000000000000000000000000..fdf2bdb1002df4a7593eff0e1725366237357420
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/writeback.proto
@@ -0,0 +1,288 @@
+// THIS FILE IS GENERATED BY ftrace_proto_generator.py, PLEASE DON'T EDIT IT!
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+option optimize_for = LITE_RUNTIME;
+
+// category: writeback
+// /sys/kernel/debug/tracing/events/writeback/balance_dirty_pages/format
+message BalanceDirtyPagesFormat {
+    string bdi = 1;
+    uint64 limit = 2;
+    uint64 setpoint = 3;
+    uint64 dirty = 4;
+    uint64 bdi_setpoint = 5;
+    uint64 bdi_dirty = 6;
+    uint64 dirty_ratelimit = 7;
+    uint64 task_ratelimit = 8;
+    uint32 dirtied = 9;
+    uint32 dirtied_pause = 10;
+    uint64 paused = 11;
+    uint64 pause = 12;
+    uint64 period = 13;
+    uint64 think = 14;
+    uint32 cgroup_ino = 15;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/bdi_dirty_ratelimit/format
+message BdiDirtyRatelimitFormat {
+    string bdi = 1;
+    uint64 write_bw = 2;
+    uint64 avg_write_bw = 3;
+    uint64 dirty_rate = 4;
+    uint64 dirty_ratelimit = 5;
+    uint64 task_ratelimit = 6;
+    uint64 balanced_dirty_ratelimit = 7;
+    uint32 cgroup_ino = 8;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/global_dirty_state/format
+message GlobalDirtyStateFormat {
+    uint64 nr_dirty = 1;
+    uint64 nr_writeback = 2;
+    uint64 nr_unstable = 3;
+    uint64 background_thresh = 4;
+    uint64 dirty_thresh = 5;
+    uint64 dirty_limit = 6;
+    uint64 nr_dirtied = 7;
+    uint64 nr_written = 8;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/wbc_writepage/format
+message WbcWritepageFormat {
+    string name = 1;
+    uint64 nr_to_write = 2;
+    uint64 pages_skipped = 3;
+    int32 sync_mode = 4;
+    int32 for_kupdate = 5;
+    int32 for_background = 6;
+    int32 for_reclaim = 7;
+    int32 range_cyclic = 8;
+    uint64 range_start = 9;
+    uint64 range_end = 10;
+    uint32 cgroup_ino = 11;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_bdi_register/format
+message WritebackBdiRegisterFormat {
+    string name = 1;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_congestion_wait/format
+message WritebackCongestionWaitFormat {
+    uint32 usec_timeout = 1;
+    uint32 usec_delayed = 2;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_dirty_inode/format
+message WritebackDirtyInodeFormat {
+    string name = 1;
+    uint64 ino = 2;
+    uint64 state = 3;
+    uint64 flags = 4;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_dirty_inode_enqueue/format
+message WritebackDirtyInodeEnqueueFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 state = 3;
+    uint32 mode = 4;
+    uint64 dirtied_when = 5;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_dirty_inode_start/format
+message WritebackDirtyInodeStartFormat {
+    string name = 1;
+    uint64 ino = 2;
+    uint64 state = 3;
+    uint64 flags = 4;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_dirty_page/format
+message WritebackDirtyPageFormat {
+    string name = 1;
+    uint64 ino = 2;
+    uint64 index = 3;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_exec/format
+message WritebackExecFormat {
+    string name = 1;
+    uint64 nr_pages = 2;
+    uint64 sb_dev = 3;
+    int32 sync_mode = 4;
+    int32 for_kupdate = 5;
+    int32 range_cyclic = 6;
+    int32 for_background = 7;
+    int32 reason = 8;
+    uint32 cgroup_ino = 9;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_lazytime/format
+message WritebackLazytimeFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 state = 3;
+    uint32 mode = 4;
+    uint64 dirtied_when = 5;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_lazytime_iput/format
+message WritebackLazytimeIputFormat {
+    uint64 dev = 1;
+    uint64 ino = 2;
+    uint64 state = 3;
+    uint32 mode = 4;
+    uint64 dirtied_when = 5;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_mark_inode_dirty/format
+message WritebackMarkInodeDirtyFormat {
+    string name = 1;
+    uint64 ino = 2;
+    uint64 state = 3;
+    uint64 flags = 4;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_pages_written/format
+message WritebackPagesWrittenFormat {
+    uint64 pages = 1;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_queue/format
+message WritebackQueueFormat {
+    string name = 1;
+    uint64 nr_pages = 2;
+    uint64 sb_dev = 3;
+    int32 sync_mode = 4;
+    int32 for_kupdate = 5;
+    int32 range_cyclic = 6;
+    int32 for_background = 7;
+    int32 reason = 8;
+    uint32 cgroup_ino = 9;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_queue_io/format
+message WritebackQueueIoFormat {
+    string name = 1;
+    uint64 older = 2;
+    uint64 age = 3;
+    int32 moved = 4;
+    int32 reason = 5;
+    uint32 cgroup_ino = 6;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_sb_inodes_requeue/format
+message WritebackSbInodesRequeueFormat {
+    string name = 1;
+    uint64 ino = 2;
+    uint64 state = 3;
+    uint64 dirtied_when = 4;
+    uint32 cgroup_ino = 5;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_single_inode/format
+message WritebackSingleInodeFormat {
+    string name = 1;
+    uint64 ino = 2;
+    uint64 state = 3;
+    uint64 dirtied_when = 4;
+    uint64 writeback_index = 5;
+    uint64 nr_to_write = 6;
+    uint64 wrote = 7;
+    uint32 cgroup_ino = 8;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_single_inode_start/format
+message WritebackSingleInodeStartFormat {
+    string name = 1;
+    uint64 ino = 2;
+    uint64 state = 3;
+    uint64 dirtied_when = 4;
+    uint64 writeback_index = 5;
+    uint64 nr_to_write = 6;
+    uint64 wrote = 7;
+    uint32 cgroup_ino = 8;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_start/format
+message WritebackStartFormat {
+    string name = 1;
+    uint64 nr_pages = 2;
+    uint64 sb_dev = 3;
+    int32 sync_mode = 4;
+    int32 for_kupdate = 5;
+    int32 range_cyclic = 6;
+    int32 for_background = 7;
+    int32 reason = 8;
+    uint32 cgroup_ino = 9;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_wait/format
+message WritebackWaitFormat {
+    string name = 1;
+    uint64 nr_pages = 2;
+    uint64 sb_dev = 3;
+    int32 sync_mode = 4;
+    int32 for_kupdate = 5;
+    int32 range_cyclic = 6;
+    int32 for_background = 7;
+    int32 reason = 8;
+    uint32 cgroup_ino = 9;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_wait_iff_congested/format
+message WritebackWaitIffCongestedFormat {
+    uint32 usec_timeout = 1;
+    uint32 usec_delayed = 2;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_wake_background/format
+message WritebackWakeBackgroundFormat {
+    string name = 1;
+    uint32 cgroup_ino = 2;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_write_inode/format
+message WritebackWriteInodeFormat {
+    string name = 1;
+    uint64 ino = 2;
+    int32 sync_mode = 3;
+    uint32 cgroup_ino = 4;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_write_inode_start/format
+message WritebackWriteInodeStartFormat {
+    string name = 1;
+    uint64 ino = 2;
+    int32 sync_mode = 3;
+    uint32 cgroup_ino = 4;
+}
+
+// /sys/kernel/debug/tracing/events/writeback/writeback_written/format
+message WritebackWrittenFormat {
+    string name = 1;
+    uint64 nr_pages = 2;
+    uint64 sb_dev = 3;
+    int32 sync_mode = 4;
+    int32 for_kupdate = 5;
+    int32 range_cyclic = 6;
+    int32 for_background = 7;
+    int32 reason = 8;
+    uint32 cgroup_ino = 9;
+}
+
diff --git a/trace_streamer/src/protos/types/plugins/hidump_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/hidump_data/BUILD.gn
index 0a2abcb11d0c0bc85a5e6e834ea354b77b9f07eb..3a977bc3d9137b6220b4b313dc4843366f36f5cf 100755
--- a/trace_streamer/src/protos/types/plugins/hidump_data/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/hidump_data/BUILD.gn
@@ -24,13 +24,18 @@ proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
 hidump_data_codegen = []
+hidump_data_codegen_reader = []
+hidump_data_codegen_all = []
 foreach(proto, hidump_data_sources) {
   name = get_path_info(proto, "name")
   hidump_data_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
+  hidump_data_codegen_reader += [ "$proto_out_dir/$name.pbreader.h" ]
 }
+hidump_data_codegen_all += hidump_data_codegen
+hidump_data_codegen_all += hidump_data_codegen_reader
 
 config("hidump_include_config") {
   include_dirs = [ "$proto_out_dir" ]
@@ -38,22 +43,28 @@ config("hidump_include_config") {
 
 #######################################################
 action("hidump_data_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = hidump_data_sources
-  outputs = hidump_data_codegen
+  outputs = hidump_data_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
 }
 
-source_set("hidump_data_cpp") {
+ohos_source_set("hidump_data_cpp") {
   deps = [ ":hidump_data_cpp_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
@@ -63,3 +74,10 @@ source_set("hidump_data_cpp") {
   public_configs = [ ":hidump_include_config" ]
   sources = hidump_data_codegen
 }
+
+ohos_source_set("hidump_data_encoder") {
+  deps = [ ":hidump_data_cpp_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":hidump_include_config" ]
+  sources = hidump_data_codegen_reader
+}
diff --git a/trace_streamer/src/protos/types/plugins/hiebpf_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/hiebpf_data/BUILD.gn
new file mode 100755
index 0000000000000000000000000000000000000000..b1a0d404e40526beae1e79260fe8efd8c968b915
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/hiebpf_data/BUILD.gn
@@ -0,0 +1,83 @@
+# Copyright (c) 2022 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+import("../../../protos.gni")
+
+hiebpf_data_sources = [ "./hiebpf_plugin_config.proto" ]
+
+#######################################################
+proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
+proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
+
+hiebpf_data_codegen = []
+hiebpf_data_codegen_standard = []
+hiebpf_data_codegen_all = []
+
+foreach(proto, hiebpf_data_sources) {
+  name = get_path_info(proto, "name")
+  hiebpf_data_codegen += [
+    "$proto_out_dir/$name.pb.h",
+    "$proto_out_dir/$name.pb.cc",
+  ]
+  hiebpf_data_codegen_standard += [
+    "$proto_out_dir/${name}_standard.pb.h",
+    "$proto_out_dir/${name}_standard.pb.cc",
+  ]
+}
+
+hiebpf_data_codegen_all += hiebpf_data_codegen
+hiebpf_data_codegen_all += hiebpf_data_codegen_standard
+
+config("hiebpf_include_config") {
+  include_dirs = [ "$proto_out_dir" ]
+}
+
+#######################################################
+action("hiebpf_data_cpp_gen") {
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
+  sources = hiebpf_data_sources
+  outputs = hiebpf_data_codegen_all
+  args = [
+    "$libc_dir_proto",
+    "$root_output_dir_proto",
+    "$proto_rel_out_dir",
+    "--cpp_out",
+    "$proto_rel_out_dir",
+    "--proto_path",
+    rebase_path(".", root_build_dir),
+  ]
+  args += rebase_path(sources, root_build_dir)
+}
+
+ohos_source_set("hiebpf_data_cpp") {
+  deps = [ ":hiebpf_data_cpp_gen" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":hiebpf_include_config" ]
+  sources = hiebpf_data_codegen
+}
+
+ohos_source_set("hiebpf_data_cpp_standard") {
+  deps = [ ":hiebpf_data_cpp_gen" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":hiebpf_include_config" ]
+  sources = hiebpf_data_codegen_standard
+}
diff --git a/trace_streamer/sdk/dubai_sdk/protos/types/plugins/mock_data/mock_plugin_config_standard.proto b/trace_streamer/src/protos/types/plugins/hiebpf_data/hiebpf_plugin_config.proto
similarity index 80%
rename from trace_streamer/sdk/dubai_sdk/protos/types/plugins/mock_data/mock_plugin_config_standard.proto
rename to trace_streamer/src/protos/types/plugins/hiebpf_data/hiebpf_plugin_config.proto
index 8e62d2e991387156dd257d7ef840ccc452cc0434..f0b44a3df808ad855266cd9e797e3a71b007489f 100755
--- a/trace_streamer/sdk/dubai_sdk/protos/types/plugins/mock_data/mock_plugin_config_standard.proto
+++ b/trace_streamer/src/protos/types/plugins/hiebpf_data/hiebpf_plugin_config.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Copyright (c) 2022 Huawei Device Co., Ltd.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -10,10 +10,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 syntax = "proto3";
-package ForStandard;
 option java_package = "ohos.devtools.datasources.transport.grpc.service";
+option optimize_for = LITE_RUNTIME;
 
-message MockConfig {
-    string msg = 1;
-}
+message HiebpfConfig {
+    string cmd_line = 1;
+    string outfile_name = 2;
+}
\ No newline at end of file
diff --git a/trace_streamer/src/protos/types/plugins/hilog_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/hilog_data/BUILD.gn
index 80ed343a2a45c8c545cf7d8af3cd4e3468248b68..b506730a11770417d70c03fc9fa0d8f457d10d05 100755
--- a/trace_streamer/src/protos/types/plugins/hilog_data/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/hilog_data/BUILD.gn
@@ -24,13 +24,18 @@ proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
 hilog_data_codegen = []
+hilog_data_codegen_reader = []
+hilog_data_codegen_all = []
 foreach(proto, hilog_data_sources) {
   name = get_path_info(proto, "name")
   hilog_data_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
+  hilog_data_codegen_reader += [ "$proto_out_dir/$name.pbreader.h" ]
 }
+hilog_data_codegen_all += hilog_data_codegen
+hilog_data_codegen_all += hilog_data_codegen_reader
 
 config("hilog_include_config") {
   include_dirs = [ "$proto_out_dir" ]
@@ -38,22 +43,28 @@ config("hilog_include_config") {
 
 #######################################################
 action("hilog_data_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = hilog_data_sources
-  outputs = hilog_data_codegen
+  outputs = hilog_data_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
 }
 
-source_set("hilog_data_cpp") {
+ohos_source_set("hilog_data_cpp") {
   deps = [ ":hilog_data_cpp_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
@@ -63,3 +74,10 @@ source_set("hilog_data_cpp") {
   public_configs = [ ":hilog_include_config" ]
   sources = hilog_data_codegen
 }
+
+ohos_source_set("hilog_data_encoder") {
+  deps = [ ":hilog_data_cpp_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":hilog_include_config" ]
+  sources = hilog_data_codegen_reader
+}
diff --git a/trace_streamer/src/protos/types/plugins/hilog_data/hilog_plugin_config.proto b/trace_streamer/src/protos/types/plugins/hilog_data/hilog_plugin_config.proto
index 1b1872474f4bdc4d2f18284015dc6aabbb359b75..79dca9d918597b2b446fb0c21260eb7c0db3fcd4 100755
--- a/trace_streamer/src/protos/types/plugins/hilog_data/hilog_plugin_config.proto
+++ b/trace_streamer/src/protos/types/plugins/hilog_data/hilog_plugin_config.proto
@@ -32,6 +32,7 @@ message HilogConfig {
     Type device_type = 1;
     Level log_level = 2;
 
+    // set the pid for get log e.g. hilogcat --pid=111
     int32 pid = 3;
     bool need_record = 4;
     bool need_clear = 5;
diff --git a/trace_streamer/src/protos/types/plugins/hiperf_call_plugin/BUILD.gn b/trace_streamer/src/protos/types/plugins/hiperf_call_plugin/BUILD.gn
index d59bfb255a4434bcb934d903f22881e8cd9ee8fa..68d441007b7ed8d12f89ce93a85c8de2b8d3646f 100755
--- a/trace_streamer/src/protos/types/plugins/hiperf_call_plugin/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/hiperf_call_plugin/BUILD.gn
@@ -32,7 +32,7 @@ foreach(proto, hiperf_call_plugin_protos_defines) {
 }
 
 action("hiperf_call_plugin_protos_protoc") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = hiperf_call_plugin_protos_defines
   outputs = hiperf_call_plugin_protos_codegen
   args = [
@@ -44,7 +44,6 @@ action("hiperf_call_plugin_protos_protoc") {
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
 }
 
 config("hiperf_call_plugin_protos_config") {
diff --git a/trace_streamer/src/protos/types/plugins/hiperf_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/hiperf_data/BUILD.gn
new file mode 100755
index 0000000000000000000000000000000000000000..9364c9cacddbf6e100de80de5ac218e3081a7f3b
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/hiperf_data/BUILD.gn
@@ -0,0 +1,81 @@
+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+import("../../../protos.gni")
+
+hiperf_data_protos_defines = [ "./hiperf_plugin_config.proto" ]
+
+#######################################################
+proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
+proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
+
+#######################################################
+hiperf_data_protos_codegen = []
+hiperf_data_protos_codegen_standard = []
+hiperf_data_protos_codegen_all = []
+foreach(proto, hiperf_data_protos_defines) {
+  name = get_path_info(proto, "name")
+  hiperf_data_protos_codegen += [
+    "$proto_out_dir/$name.pb.h",
+    "$proto_out_dir/$name.pb.cc",
+  ]
+  hiperf_data_protos_codegen_standard += [
+    "$proto_out_dir/${name}_standard.pb.h",
+    "$proto_out_dir/${name}_standard.pb.cc",
+  ]
+}
+hiperf_data_protos_codegen_all += hiperf_data_protos_codegen
+hiperf_data_protos_codegen_all += hiperf_data_protos_codegen_standard
+
+action("hiperf_data_protos_protoc") {
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
+  sources = hiperf_data_protos_defines
+  outputs = hiperf_data_protos_codegen_all
+  args = [
+    "$libc_dir_proto",
+    "$root_output_dir_proto",
+    "$proto_rel_out_dir",
+    "--cpp_out",
+    "$proto_rel_out_dir",
+    "--proto_path",
+    rebase_path(".", root_build_dir),
+  ]
+  args += rebase_path(sources, root_build_dir)
+}
+
+config("hiperf_data_protos_config") {
+  include_dirs = [ "$proto_out_dir" ]
+}
+
+ohos_source_set("hiperf_data_cpp") {
+  deps = [ ":hiperf_data_protos_protoc" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":hiperf_data_protos_config" ]
+  sources = hiperf_data_protos_codegen
+}
+
+ohos_source_set("hiperf_data_cpp_standard") {
+  deps = [ ":hiperf_data_protos_protoc" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":hiperf_data_protos_config" ]
+  sources = hiperf_data_protos_codegen_standard
+}
diff --git a/trace_streamer/src/protos/types/plugins/hiperf_data/hiperf_plugin_config.proto b/trace_streamer/src/protos/types/plugins/hiperf_data/hiperf_plugin_config.proto
new file mode 100755
index 0000000000000000000000000000000000000000..b5933b06a96b3bdc21015a8489b86b232afe5b2a
--- /dev/null
+++ b/trace_streamer/src/protos/types/plugins/hiperf_data/hiperf_plugin_config.proto
@@ -0,0 +1,28 @@
+// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+option optimize_for = LITE_RUNTIME;
+
+message HiperfPluginConfig {
+    bool is_root = 1;
+    string outfile_name = 2; // set output file name, must be set for merging to one file
+    string record_args = 3; // set arguments of hiperf record
+    enum LogLevel {
+        NO_LOG = 0;
+        MUCH = 1;
+        VERBOSE = 2;
+        DEBUG = 3;
+    };
+    LogLevel log_level = 4; // set log level, default is NO_LOG
+}
\ No newline at end of file
diff --git a/trace_streamer/src/protos/types/plugins/hisysevent_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/hisysevent_data/BUILD.gn
index 64bf34a022c1e3b988cd9eb0462ac47bed0e2248..76cca46b99cd7cc1d4f84269ac0d91621a54b4d3 100644
--- a/trace_streamer/src/protos/types/plugins/hisysevent_data/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/hisysevent_data/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -24,7 +24,7 @@ proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
 hisysevent_data_codegen = []
-hisysevent_data_codegen_standard = []
+hisysevent_data_codegen_reader = []
 hisysevent_data_codegen_all = []
 
 foreach(proto, hisysevent_data_sources) {
@@ -33,14 +33,11 @@ foreach(proto, hisysevent_data_sources) {
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
-  hisysevent_data_codegen_standard += [
-    "$proto_out_dir/${name}_standard.pb.h",
-    "$proto_out_dir/${name}_standard.pb.cc",
-  ]
+  hisysevent_data_codegen_reader += [ "$proto_out_dir/$name.pbreader.h" ]
 }
 
 hisysevent_data_codegen_all += hisysevent_data_codegen
-hisysevent_data_codegen_all += hisysevent_data_codegen_standard
+hisysevent_data_codegen_all += hisysevent_data_codegen_reader
 
 config("hisysevent_include_config") {
   include_dirs = [ "$proto_out_dir" ]
@@ -48,7 +45,7 @@ config("hisysevent_include_config") {
 
 #######################################################
 action("hisysevent_data_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = hisysevent_data_sources
   outputs = hisysevent_data_codegen_all
   args = [
@@ -61,10 +58,15 @@ action("hisysevent_data_cpp_gen") {
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
 }
 
-source_set("hisysevent_data_cpp") {
+ohos_source_set("hisysevent_data_cpp") {
   deps = [ ":hisysevent_data_cpp_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
@@ -75,13 +77,9 @@ source_set("hisysevent_data_cpp") {
   sources = hisysevent_data_codegen
 }
 
-source_set("hisysevent_data_cpp_standard") {
+ohos_source_set("hisysevent_data_encoder") {
   deps = [ ":hisysevent_data_cpp_gen" ]
-  public_deps = [
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
-    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
-  ]
   include_dirs = [ "$proto_out_dir" ]
   public_configs = [ ":hisysevent_include_config" ]
-  sources = hisysevent_data_codegen_standard
+  sources = hisysevent_data_codegen_reader
 }
diff --git a/trace_streamer/src/protos/types/plugins/hisysevent_data/hisysevent_plugin_config.proto b/trace_streamer/src/protos/types/plugins/hisysevent_data/hisysevent_plugin_config.proto
index 9b7a6e5270599141a658551e9e6377e8c291d395..bce0cf0c97cccdf1a87360c8f663fa681d8d72a3 100644
--- a/trace_streamer/src/protos/types/plugins/hisysevent_data/hisysevent_plugin_config.proto
+++ b/trace_streamer/src/protos/types/plugins/hisysevent_data/hisysevent_plugin_config.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Copyright (c) 2022 Huawei Device Co., Ltd.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/trace_streamer/src/protos/types/plugins/hisysevent_data/hisysevent_plugin_result.proto b/trace_streamer/src/protos/types/plugins/hisysevent_data/hisysevent_plugin_result.proto
index 4dba0ff2b16e93fa2b68917d8e10ec619b72efd2..80d0835559a22e81851c4d616eeed34a1f9deb7c 100644
--- a/trace_streamer/src/protos/types/plugins/hisysevent_data/hisysevent_plugin_result.proto
+++ b/trace_streamer/src/protos/types/plugins/hisysevent_data/hisysevent_plugin_result.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Huawei Device Co., Ltd.
+// Copyright (c) 2022 Huawei Device Co., Ltd.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/trace_streamer/src/protos/types/plugins/js_memory/BUILD.gn b/trace_streamer/src/protos/types/plugins/js_memory/BUILD.gn
index 931eb4c2955da6163e926e185ad6ee07ba6833fa..34d4badcc450c641ea001ba8b7db51c39a002338 100755
--- a/trace_streamer/src/protos/types/plugins/js_memory/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/js_memory/BUILD.gn
@@ -14,7 +14,7 @@
 import("//build/ohos.gni")
 import("../../../protos.gni")
 
-js_memory_sources = [
+js_memory_data_sources = [
   "./js_heap_config.proto",
   "./js_heap_result.proto",
 ]
@@ -23,43 +23,61 @@ js_memory_sources = [
 proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
-js_memory_codegen = []
-foreach(proto, js_memory_sources) {
+js_memory_data_codegen = []
+js_memory_data_codegen_reader = []
+js_memory_data_codegen_all = []
+foreach(proto, js_memory_data_sources) {
   name = get_path_info(proto, "name")
-  js_memory_codegen += [
+  js_memory_data_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
+  js_memory_data_codegen_reader += [ "$proto_out_dir/$name.pbreader.h" ]
 }
+js_memory_data_codegen_all += js_memory_data_codegen
+js_memory_data_codegen_all += js_memory_data_codegen_reader
 
 config("js_memory_include_config") {
   include_dirs = [ "$proto_out_dir" ]
 }
 
 #######################################################
-action("js_memory_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
-  sources = js_memory_sources
-  outputs = js_memory_codegen
+action("js_memory_data_cpp_gen") {
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
+  sources = js_memory_data_sources
+  outputs = js_memory_data_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
 }
 
-source_set("js_memory_cpp") {
-  deps = [ ":js_memory_cpp_gen" ]
+ohos_source_set("js_memory_data_cpp") {
+  deps = [ ":js_memory_data_cpp_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
   ]
   include_dirs = [ "$proto_out_dir" ]
   public_configs = [ ":js_memory_include_config" ]
-  sources = js_memory_codegen
+  sources = js_memory_data_codegen
+}
+
+ohos_source_set("js_memory_data_encoder") {
+  deps = [ ":js_memory_data_cpp_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":js_memory_include_config" ]
+  sources = js_memory_data_codegen_reader
 }
diff --git a/trace_streamer/src/protos/types/plugins/memory_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/memory_data/BUILD.gn
index fa25351a2ece5839a50c60e674d1f68e24dc2700..c713e08bb1ab4a817538533d0d30d2b51220a06c 100755
--- a/trace_streamer/src/protos/types/plugins/memory_data/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/memory_data/BUILD.gn
@@ -25,13 +25,19 @@ proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
 memory_data_codegen = []
+memory_data_codegen_all = []
+memory_data_codegen_reader = []
+
 foreach(proto, memory_data_sources) {
   name = get_path_info(proto, "name")
   memory_data_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
+  memory_data_codegen_reader += [ "$proto_out_dir/${name}.pbreader.h" ]
 }
+memory_data_codegen_all += memory_data_codegen
+memory_data_codegen_all += memory_data_codegen_reader
 
 config("memory_include_config") {
   include_dirs = [ "$proto_out_dir" ]
@@ -39,22 +45,28 @@ config("memory_include_config") {
 
 #######################################################
 action("memory_data_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = memory_data_sources
-  outputs = memory_data_codegen
+  outputs = memory_data_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
 }
 
-source_set("memory_data_cpp") {
+ohos_source_set("memory_data_cpp") {
   deps = [ ":memory_data_cpp_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
@@ -64,3 +76,10 @@ source_set("memory_data_cpp") {
   public_configs = [ ":memory_include_config" ]
   sources = memory_data_codegen
 }
+
+ohos_source_set("memory_data_encoder") {
+  deps = [ ":memory_data_cpp_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":memory_include_config" ]
+  sources = memory_data_codegen_reader
+}
diff --git a/trace_streamer/src/protos/types/plugins/memory_data/memory_plugin_config.proto b/trace_streamer/src/protos/types/plugins/memory_data/memory_plugin_config.proto
index 72f824df4f75a37224bcf24fb4d50181c1093f4f..af8d87ae499f0f139be8c7115685dc26b51c7573 100755
--- a/trace_streamer/src/protos/types/plugins/memory_data/memory_plugin_config.proto
+++ b/trace_streamer/src/protos/types/plugins/memory_data/memory_plugin_config.proto
@@ -34,9 +34,11 @@ message MemoryConfig {
     bool report_process_mem_info = 6;
     // set true to report application memory usage summary, eg:java heap memory, native heap, stack memory, etc.
     bool report_app_mem_info = 7;
-    // set true to report application memory by dumpsys service, otherwise,
+    // set true to report application memory by memory service, otherwise,
     // application memory will count up by /proc/${pid}/smaps information
-    bool report_app_mem_by_dumpsys = 8;
+    bool report_app_mem_by_memory_service = 8;
     // set required pid list
     repeated int32 pid = 9;
+    // set true to report smaps meminfo from /proc/${pid}/smaps
+    bool report_smaps_mem_info = 10;
 }
diff --git a/trace_streamer/src/protos/types/plugins/native_hook/BUILD.gn b/trace_streamer/src/protos/types/plugins/native_hook/BUILD.gn
index 7f3c49746438d574eb4f23fdf021d20c5cd7df14..81140cad6468b93d243f1ba90fb7c82fd7de148e 100755
--- a/trace_streamer/src/protos/types/plugins/native_hook/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/native_hook/BUILD.gn
@@ -24,13 +24,18 @@ proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
 native_hook_codegen = []
+native_hook_codegen_reader = []
+native_hook_codegen_all = []
 foreach(proto, native_hook_sources) {
   name = get_path_info(proto, "name")
   native_hook_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
+  native_hook_codegen_reader += [ "$proto_out_dir/${name}.pbreader.h" ]
 }
+native_hook_codegen_all += native_hook_codegen
+native_hook_codegen_all += native_hook_codegen_reader
 
 config("native_hook_include_config") {
   include_dirs = [ "$proto_out_dir" ]
@@ -38,22 +43,28 @@ config("native_hook_include_config") {
 
 #######################################################
 action("native_hook_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = native_hook_sources
-  outputs = native_hook_codegen
+  outputs = native_hook_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
 }
 
-source_set("native_hook_cpp") {
+ohos_source_set("native_hook_cpp") {
   deps = [ ":native_hook_cpp_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
@@ -63,3 +74,13 @@ source_set("native_hook_cpp") {
   public_configs = [ ":native_hook_include_config" ]
   sources = native_hook_codegen
 }
+source_set("native_hook_data_encoder") {
+  deps = [ ":native_hook_cpp_gen" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":native_hook_include_config" ]
+  sources = native_hook_codegen_reader
+}
diff --git a/trace_streamer/src/protos/types/plugins/native_hook/native_hook_config.proto b/trace_streamer/src/protos/types/plugins/native_hook/native_hook_config.proto
index 0d9891650d6cb99c78b59e0e2ec37033104d9646..a492c30f349b2404c5465e9a55104cb4c5b41f06 100755
--- a/trace_streamer/src/protos/types/plugins/native_hook/native_hook_config.proto
+++ b/trace_streamer/src/protos/types/plugins/native_hook/native_hook_config.proto
@@ -38,6 +38,8 @@ message NativeHookConfig {
     bool startup_mode = 18;
     bool memtrace_enable = 19;
     bool offline_symbolization = 20;
-    bool callframe_compressed = 21;
+    bool callframe_compress = 21;
+    // Configure zero to disable the data statistics function,
+    // greater than zero reports statistical data according to the configured numeric interval
     uint32 statistics_interval = 22;
 }
diff --git a/trace_streamer/src/protos/types/plugins/native_hook/native_hook_result.proto b/trace_streamer/src/protos/types/plugins/native_hook/native_hook_result.proto
index 97a80784aa5486029d6a48b699c49fa2f8de303d..578e5ad219ae7d28c90b314b6f3333f3b4c7f860 100755
--- a/trace_streamer/src/protos/types/plugins/native_hook/native_hook_result.proto
+++ b/trace_streamer/src/protos/types/plugins/native_hook/native_hook_result.proto
@@ -116,6 +116,7 @@ message SymbolTable {
     bytes str_table = 6;
 }
 
+
 message RecordStatisticsEvent {
     uint32 pid = 1;
     uint32 callstack_id = 2;
diff --git a/trace_streamer/src/protos/types/plugins/network_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/network_data/BUILD.gn
index a1155307a98cbd7ac3a5e9be0e74ae71386d09a9..381c756cece7c59b8f4d401da8e7c78dafdf13fd 100755
--- a/trace_streamer/src/protos/types/plugins/network_data/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/network_data/BUILD.gn
@@ -24,13 +24,18 @@ proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
 network_data_codegen = []
+network_data_codegen_reader = []
+network_data_codegen_all = []
 foreach(proto, network_data_sources) {
   name = get_path_info(proto, "name")
   network_data_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
+  network_data_codegen_reader += [ "$proto_out_dir/$name.pbreader.h" ]
 }
+network_data_codegen_all += network_data_codegen
+network_data_codegen_all += network_data_codegen_reader
 
 config("network_include_config") {
   include_dirs = [ "$proto_out_dir" ]
@@ -38,22 +43,28 @@ config("network_include_config") {
 
 #######################################################
 action("network_data_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = network_data_sources
-  outputs = network_data_codegen
+  outputs = network_data_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
 }
 
-source_set("network_data_cpp") {
+ohos_source_set("network_data_cpp") {
   deps = [ ":network_data_cpp_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
@@ -63,3 +74,10 @@ source_set("network_data_cpp") {
   public_configs = [ ":network_include_config" ]
   sources = network_data_codegen
 }
+
+ohos_source_set("network_data_encoder") {
+  deps = [ ":network_data_cpp_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":network_include_config" ]
+  sources = network_data_codegen_reader
+}
diff --git a/trace_streamer/src/protos/types/plugins/network_data/network_plugin_config.proto b/trace_streamer/src/protos/types/plugins/network_data/network_plugin_config.proto
index b993e8c595554e5e9408c2aa43b8e4489c2fbc1e..fc17d6525a1a6fbeefb253ad435eb4e04edaa657 100755
--- a/trace_streamer/src/protos/types/plugins/network_data/network_plugin_config.proto
+++ b/trace_streamer/src/protos/types/plugins/network_data/network_plugin_config.proto
@@ -18,4 +18,5 @@ option optimize_for = LITE_RUNTIME;
 
 message NetworkConfig {
     repeated int32 pid = 1;
+    string test_file = 2;
 }
\ No newline at end of file
diff --git a/trace_streamer/src/protos/types/plugins/process_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/process_data/BUILD.gn
index e519eb418fdb26a42f3f621274c9b79cc8d431e8..1812bdffe1887a77bd08bdb6ad99480ff4180a30 100755
--- a/trace_streamer/src/protos/types/plugins/process_data/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/process_data/BUILD.gn
@@ -24,13 +24,18 @@ proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
 process_data_codegen = []
+process_data_codegen_reader = []
+process_data_codegen_all = []
 foreach(proto, process_data_sources) {
   name = get_path_info(proto, "name")
   process_data_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
+  process_data_codegen_reader += [ "$proto_out_dir/$name.pbreader.h" ]
 }
+process_data_codegen_all += process_data_codegen
+process_data_codegen_all += process_data_codegen_reader
 
 config("process_include_config") {
   include_dirs = [ "$proto_out_dir" ]
@@ -38,22 +43,28 @@ config("process_include_config") {
 
 #######################################################
 action("process_data_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = process_data_sources
-  outputs = process_data_codegen
+  outputs = process_data_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
 }
 
-source_set("process_data_cpp") {
+ohos_source_set("process_data_cpp") {
   deps = [ ":process_data_cpp_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
@@ -63,3 +74,10 @@ source_set("process_data_cpp") {
   public_configs = [ ":process_include_config" ]
   sources = process_data_codegen
 }
+
+ohos_source_set("process_data_encoder") {
+  deps = [ ":process_data_cpp_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":process_include_config" ]
+  sources = process_data_codegen_reader
+}
diff --git a/trace_streamer/src/protos/types/plugins/process_data/process_plugin_config.proto b/trace_streamer/src/protos/types/plugins/process_data/process_plugin_config.proto
index ecb8389276bd5e728f4bd14edf8a66710d7d6b13..75b20efc405e583b395c0e8c95c3ee1f952fff04 100755
--- a/trace_streamer/src/protos/types/plugins/process_data/process_plugin_config.proto
+++ b/trace_streamer/src/protos/types/plugins/process_data/process_plugin_config.proto
@@ -19,4 +19,7 @@ option optimize_for = LITE_RUNTIME;
 message ProcessConfig {
     // set true to report process list
     bool report_process_tree = 1;
+    bool report_cpu = 2;
+    bool report_diskio = 3;
+    bool report_pss = 4;
 }
diff --git a/trace_streamer/src/protos/types/plugins/sample_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/sample_data/BUILD.gn
index 1173d1ac8737a9c31561a8bb5bf930e4c3b5fea5..cee7f3d3b5b13b84330f7a132a3b38579f157a55 100755
--- a/trace_streamer/src/protos/types/plugins/sample_data/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/sample_data/BUILD.gn
@@ -24,13 +24,24 @@ proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
 sample_data_codegen = []
+sample_data_codegen_standard = []
+sample_data_codegen_reader = []
+sample_data_codegen_all = []
 foreach(proto, sample_data_sources) {
   name = get_path_info(proto, "name")
   sample_data_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
+  sample_data_codegen_standard += [
+    "$proto_out_dir/${name}_standard.pb.h",
+    "$proto_out_dir/${name}_standard.pb.cc",
+  ]
+  sample_data_codegen_reader += [ "$proto_out_dir/$name.pbreader.h" ]
 }
+sample_data_codegen_all += sample_data_codegen
+sample_data_codegen_all += sample_data_codegen_standard
+sample_data_codegen_all += sample_data_codegen_reader
 
 config("sample_include_config") {
   include_dirs = [ "$proto_out_dir" ]
@@ -38,22 +49,23 @@ config("sample_include_config") {
 
 #######################################################
 action("sample_data_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = sample_data_sources
-  outputs = sample_data_codegen
+  outputs = sample_data_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  deps = []
 }
 
-source_set("sample_data_cpp") {
+ohos_source_set("sample_data_cpp") {
   deps = [ ":sample_data_cpp_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
@@ -63,3 +75,10 @@ source_set("sample_data_cpp") {
   public_configs = [ ":sample_include_config" ]
   sources = sample_data_codegen
 }
+
+ohos_source_set("sample_data_encoder") {
+  deps = [ ":sample_data_cpp_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":sample_include_config" ]
+  sources = sample_data_codegen_reader
+}
diff --git a/trace_streamer/src/protos/types/plugins/sample_data/sample_plugin_result.proto b/trace_streamer/src/protos/types/plugins/sample_data/sample_plugin_result.proto
index 0a8d74393c6387eb5d0bfd4ce8a5a2bdc0d289c0..0418c7a57d488433aac656509a41162a03139990 100755
--- a/trace_streamer/src/protos/types/plugins/sample_data/sample_plugin_result.proto
+++ b/trace_streamer/src/protos/types/plugins/sample_data/sample_plugin_result.proto
@@ -15,5 +15,7 @@ option java_package = "ohos.devtools.datasources.transport.grpc.service";
 option optimize_for = LITE_RUNTIME;
 
 message SampleData {
-  uint64 time_ms = 1;
+    uint64 time_ms = 1;
+    int32 int_data = 2;
+    double double_data = 3;
 }
\ No newline at end of file
diff --git a/trace_streamer/src/protos/types/plugins/stream_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/stream_data/BUILD.gn
index 5c991ecd27c6e5c0215cc0b5c47acce704f26a54..4aa7d544baf35fe2c3d7264804a271e69fdd0e87 100755
--- a/trace_streamer/src/protos/types/plugins/stream_data/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/stream_data/BUILD.gn
@@ -24,13 +24,24 @@ proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
 stream_data_codegen = []
+stream_data_codegen_standard = []
+stream_data_codegen_reader = []
+stream_data_codegen_all = []
 foreach(proto, stream_data_sources) {
   name = get_path_info(proto, "name")
   stream_data_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
+  stream_data_codegen_standard += [
+    "$proto_out_dir/${name}_standard.pb.h",
+    "$proto_out_dir/${name}_standard.pb.cc",
+  ]
+  stream_data_codegen_reader += [ "$proto_out_dir/$name.pbreader.h" ]
 }
+stream_data_codegen_all += stream_data_codegen
+stream_data_codegen_all += stream_data_codegen_standard
+stream_data_codegen_all += stream_data_codegen_reader
 
 config("stream_include_config") {
   include_dirs = [ "$proto_out_dir" ]
@@ -38,22 +49,23 @@ config("stream_include_config") {
 
 #######################################################
 action("stream_data_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = stream_data_sources
-  outputs = stream_data_codegen
+  outputs = stream_data_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  deps = []
 }
 
-source_set("stream_data_cpp") {
+ohos_source_set("stream_data_cpp") {
   deps = [ ":stream_data_cpp_gen" ]
   public_deps = [
     "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
@@ -63,3 +75,10 @@ source_set("stream_data_cpp") {
   public_configs = [ ":stream_include_config" ]
   sources = stream_data_codegen
 }
+
+ohos_source_set("stream_data_encoder") {
+  deps = [ ":stream_data_cpp_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":stream_include_config" ]
+  sources = stream_data_codegen_reader
+}
diff --git a/trace_streamer/src/protos/types/plugins/stream_data/stream_plugin_result.proto b/trace_streamer/src/protos/types/plugins/stream_data/stream_plugin_result.proto
index ece7d24105cc0f46574aefe0d7b4c2a456e746a1..66d2a334ef628fda1a55602a2a763c8fb58a0994 100755
--- a/trace_streamer/src/protos/types/plugins/stream_data/stream_plugin_result.proto
+++ b/trace_streamer/src/protos/types/plugins/stream_data/stream_plugin_result.proto
@@ -15,5 +15,6 @@ option java_package = "ohos.devtools.datasources.transport.grpc.service";
 option optimize_for = LITE_RUNTIME;
 
 message StreamData {
-    uint64 time_ms = 1;
+  uint64 intdata = 1;
+  string stringdata = 2;
 }
\ No newline at end of file
diff --git a/trace_streamer/src/protos/types/plugins/test_data/BUILD.gn b/trace_streamer/src/protos/types/plugins/test_data/BUILD.gn
index e1f149c9b70b1d599dc0d9cfa4dbc7807707c2eb..f932dbb18dfacf4da598856dde809ffac084ba47 100644
--- a/trace_streamer/src/protos/types/plugins/test_data/BUILD.gn
+++ b/trace_streamer/src/protos/types/plugins/test_data/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../../../../build/ohos.gni")
+import("//build/ohos.gni")
 import("../../../protos.gni")
 
 test_data_sources = [ "./test.proto" ]
@@ -21,33 +21,44 @@ proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
 proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
 
 test_data_codegen = []
+test_data_codegen_reader = []
+test_data_codegen_all = []
 foreach(proto, test_data_sources) {
   name = get_path_info(proto, "name")
   test_data_codegen += [
     "$proto_out_dir/$name.pb.h",
     "$proto_out_dir/$name.pb.cc",
   ]
+  test_data_codegen_reader += [ "$proto_out_dir/$name.pbreader.h" ]
 }
 
+test_data_codegen_all += test_data_codegen
+test_data_codegen_all += test_data_codegen_reader
 config("test_include_config") {
   include_dirs = [ "$proto_out_dir" ]
 }
 
 #######################################################
 action("test_data_cpp_gen") {
-  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  script = "${OHOS_TRACE_STREAMER_DIR_PROTOC}"
   sources = test_data_sources
-  outputs = test_data_codegen
+  outputs = test_data_codegen_all
   args = [
     "$libc_dir_proto",
     "$root_output_dir_proto",
+    "$proto_rel_out_dir",
     "--cpp_out",
     "$proto_rel_out_dir",
     "--proto_path",
     rebase_path(".", root_build_dir),
   ]
   args += rebase_path(sources, root_build_dir)
-  deps = [ "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})" ]
+  if (!use_wasm && !is_test && !is_fuzz) {
+    deps = [
+      "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc",
+      "${SRC}/proto_reader/protoc_plugin:protoreader_plugin",
+    ]
+  }
 }
 
 source_set("test_data_cpp") {
@@ -60,3 +71,10 @@ source_set("test_data_cpp") {
   public_configs = [ ":test_include_config" ]
   sources = test_data_codegen
 }
+
+ohos_source_set("test_data_encoder") {
+  deps = [ ":test_data_cpp_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":test_include_config" ]
+  sources = test_data_codegen_reader
+}
diff --git a/trace_streamer/src/rpc/wasm_func.cpp b/trace_streamer/src/rpc/wasm_func.cpp
index b170a0a1259a21ad992c45da646e92efea192f64..dd825a422969cc993bce5ddc1a398093f6f81720 100644
--- a/trace_streamer/src/rpc/wasm_func.cpp
+++ b/trace_streamer/src/rpc/wasm_func.cpp
@@ -15,6 +15,9 @@
 
 #include "wasm_func.h"
 
+#ifndef NAME_MAX
+#define NAME_MAX 255
+#endif
 namespace SysTuning {
 namespace TraceStreamer {
 RpcServer g_wasmTraceStreamer;
diff --git a/trace_streamer/src/table/BUILD.gn b/trace_streamer/src/table/BUILD.gn
index 63b603e20577365ce153bba3988fa65995554a6a..622e6d866e19cf623b6d48c759633b85ffc42183 100644
--- a/trace_streamer/src/table/BUILD.gn
+++ b/trace_streamer/src/table/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../build/ohos.gni")
+import("//build/ohos.gni")
 
 import("../../build/ts.gni")
 ohos_source_set("table") {
@@ -25,7 +25,6 @@ ohos_source_set("table") {
     "${SRC}/trace_data",
     "${SRC}/include",
     "${SRC}",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
     "${THIRD_PARTY}/protobuf/src",
   ]
 
diff --git a/trace_streamer/src/table/base/BUILD.gn b/trace_streamer/src/table/base/BUILD.gn
index 8a65708f0808f6c8e7c216e619bc963c39b1a7b6..a7a88cba56e1cdb4bd94911aa2d83bd112220c56 100644
--- a/trace_streamer/src/table/base/BUILD.gn
+++ b/trace_streamer/src/table/base/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../../build/ohos.gni")
+import("//build/ohos.gni")
 
 import("../../../build/ts.gni")
 ohos_source_set("base_tables") {
@@ -48,10 +48,8 @@ ohos_source_set("base_tables") {
     "${SRC}/trace_data",
     "${SRC}/include",
     "${SRC}",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
     "${THIRD_PARTY}/protobuf/src",
   ]
-
   if (enable_ts_utest && !use_wasm) {
     cflags = [
       "-fprofile-arcs",
diff --git a/trace_streamer/src/table/base/span_join.cpp b/trace_streamer/src/table/base/span_join.cpp
index d154e22f8f60e230cc9c7a89df0370077b8bc288..1677f2de4d265c3e1d21bb9ae67eaae39a7df768 100644
--- a/trace_streamer/src/table/base/span_join.cpp
+++ b/trace_streamer/src/table/base/span_join.cpp
@@ -150,7 +150,7 @@ void SpanJoin::GetColumns(const TraceDataCache* dataCache,
 {
     char sql[MAXSIZE];
     std::string querySql = "SELECT name, type from PRAGMA_table_info(\"%s\")";
-    int32_t n = snprintf(sql, sizeof(sql), querySql.c_str(), tableName.c_str());
+    int32_t n = snprintf_s(sql, sizeof(sql), 1, querySql.c_str(), tableName.c_str());
     sqlite3_stmt* stmt = nullptr;
     int32_t ret = sqlite3_prepare_v2(dataCache->db_, sql, n, &stmt, nullptr);
     while (!ret) {
diff --git a/trace_streamer/src/table/ebpf/BUILD.gn b/trace_streamer/src/table/ebpf/BUILD.gn
index e7ea2451f7b8a7859ce20696abfd1804f56b9650..6c9b8ad6f14da8fa5a111fc997fa27f598d623dd 100644
--- a/trace_streamer/src/table/ebpf/BUILD.gn
+++ b/trace_streamer/src/table/ebpf/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../../build/ohos.gni")
+import("//build/ohos.gni")
 
 import("../../../build/ts.gni")
 ohos_source_set("ebpf_tables") {
@@ -25,7 +25,6 @@ ohos_source_set("ebpf_tables") {
     "file_system_sample_table.cpp",
     "file_system_sample_table.h",
   ]
-
   if (with_ebpf_help_table) {
     sources += [
       "ebpf_elf_symbol_table.cpp",
@@ -44,7 +43,6 @@ ohos_source_set("ebpf_tables") {
     "${SRC}/trace_data",
     "${SRC}/include",
     "${SRC}",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
     "${THIRD_PARTY}/protobuf/src",
   ]
 
diff --git a/trace_streamer/src/table/ftrace/BUILD.gn b/trace_streamer/src/table/ftrace/BUILD.gn
index bfd32397cb9ae327e88aa69af9c5b7914d59e197..8cdc5ba0ce19b7f859427c812f5d8b5781f9e562 100644
--- a/trace_streamer/src/table/ftrace/BUILD.gn
+++ b/trace_streamer/src/table/ftrace/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../../build/ohos.gni")
+import("//build/ohos.gni")
 
 import("../../../build/ts.gni")
 ohos_source_set("ftrace_tables") {
@@ -74,10 +74,8 @@ ohos_source_set("ftrace_tables") {
     "${SRC}/trace_data",
     "${SRC}/include",
     "${SRC}",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
     "${THIRD_PARTY}/protobuf/src",
   ]
-
   if (enable_ts_utest && !use_wasm) {
     cflags = [
       "-fprofile-arcs",
diff --git a/trace_streamer/src/table/ftrace/thread_state_table.cpp b/trace_streamer/src/table/ftrace/thread_state_table.cpp
index 1535a6b87fd7a0e2f8ca00b5c74cb405adbe5044..a9427a0efff77d2b1268cc6272d1d5692bf043ec 100644
--- a/trace_streamer/src/table/ftrace/thread_state_table.cpp
+++ b/trace_streamer/src/table/ftrace/thread_state_table.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "thread_state_table.h"
-#include "thread_state.h"
+#include "thread_state_flag.h"
 
 #include <cmath>
 
diff --git a/trace_streamer/src/table/ftrace/thread_state_table.h b/trace_streamer/src/table/ftrace/thread_state_table.h
index 4b969195a1f228545a04c052994e7c867605b212..6d3ac8560df788594154437054237a6a6e951ac6 100644
--- a/trace_streamer/src/table/ftrace/thread_state_table.h
+++ b/trace_streamer/src/table/ftrace/thread_state_table.h
@@ -41,7 +41,7 @@ private:
         int32_t Column(int32_t col) const override;
 
     private:
-        const ThreadState& threadStateObj_;
+        const ThreadStateData& threadStateObj_;
     };
 };
 } // namespace TraceStreamer
diff --git a/trace_streamer/src/table/hi_sysevent/BUILD.gn b/trace_streamer/src/table/hi_sysevent/BUILD.gn
index 34f1170a3ce755e6430cc3a41654c0e555b28ccd..9c56b5318692b58506dcbe290217bdcc88035596 100644
--- a/trace_streamer/src/table/hi_sysevent/BUILD.gn
+++ b/trace_streamer/src/table/hi_sysevent/BUILD.gn
@@ -31,7 +31,6 @@ ohos_source_set("hi_sysevent_tables") {
     "${SRC}/trace_data",
     "${SRC}/include",
     "${SRC}",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
     "${THIRD_PARTY}/protobuf/src",
   ]
 
diff --git a/trace_streamer/src/table/hiperf/BUILD.gn b/trace_streamer/src/table/hiperf/BUILD.gn
index 4e609264615c3c3ea3bb2dae15a85ce6ee855b37..7feb5fca6f733d231566be29ed392aa25d4ef3a4 100644
--- a/trace_streamer/src/table/hiperf/BUILD.gn
+++ b/trace_streamer/src/table/hiperf/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../../build/ohos.gni")
+import("//build/ohos.gni")
 
 import("../../../build/ts.gni")
 ohos_source_set("hiperf_tables") {
@@ -38,7 +38,6 @@ ohos_source_set("hiperf_tables") {
     "${SRC}/trace_data",
     "${SRC}/include",
     "${SRC}",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
     "${THIRD_PARTY}/protobuf/src",
   ]
 
diff --git a/trace_streamer/src/table/js_memory/BUILD.gn b/trace_streamer/src/table/js_memory/BUILD.gn
index 68eeb87edc1f78b9004fc6f3c35559b75330e268..8bab747489707d11c6988e827dcce6c887c7ead9 100644
--- a/trace_streamer/src/table/js_memory/BUILD.gn
+++ b/trace_streamer/src/table/js_memory/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../../build/ohos.gni")
+import("//build/ohos.gni")
 
 import("../../../build/ts.gni")
 ohos_source_set("js_memory_tables") {
@@ -47,7 +47,6 @@ ohos_source_set("js_memory_tables") {
     "${SRC}/trace_data",
     "${SRC}/include",
     "${SRC}",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
     "${THIRD_PARTY}/protobuf/src",
   ]
 
diff --git a/trace_streamer/src/table/monitor/BUILD.gn b/trace_streamer/src/table/monitor/BUILD.gn
index c1f8c016da3c5ab4f4acc924991e6dc9c2d9da4e..068932e918ce8bd4d854db8600b0e4afe1a3dca2 100644
--- a/trace_streamer/src/table/monitor/BUILD.gn
+++ b/trace_streamer/src/table/monitor/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../../build/ohos.gni")
+import("//build/ohos.gni")
 
 import("../../../build/ts.gni")
 ohos_source_set("monitor_tables") {
@@ -43,7 +43,6 @@ ohos_source_set("monitor_tables") {
     "${SRC}/trace_data",
     "${SRC}/include",
     "${SRC}",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
     "${THIRD_PARTY}/protobuf/src",
   ]
 
diff --git a/trace_streamer/src/table/native_hook/BUILD.gn b/trace_streamer/src/table/native_hook/BUILD.gn
index 0f34272305e3ba2ddff10163482c86586ee61a6d..a63af8dc51fd17524dc08d0dfa964c8b3e18ee59 100644
--- a/trace_streamer/src/table/native_hook/BUILD.gn
+++ b/trace_streamer/src/table/native_hook/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../../build/ohos.gni")
+import("//build/ohos.gni")
 
 import("../../../build/ts.gni")
 ohos_source_set("native_hook_tables") {
@@ -34,7 +34,6 @@ ohos_source_set("native_hook_tables") {
     "${SRC}/trace_data",
     "${SRC}/include",
     "${SRC}",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
     "${THIRD_PARTY}/protobuf/src",
   ]
 
diff --git a/trace_streamer/src/trace_data/BUILD.gn b/trace_streamer/src/trace_data/BUILD.gn
index 828d9a60b22758429de62f9a089f007eb952c1ca..064716fc150f8703572b4534f62a1528ea0d1809 100644
--- a/trace_streamer/src/trace_data/BUILD.gn
+++ b/trace_streamer/src/trace_data/BUILD.gn
@@ -61,7 +61,6 @@ ohos_source_set("trace_data") {
     "${SRC}/table/monitor",
     "${SRC}/table/native_hook",
     ".",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
     "${THIRD_PARTY}/protobuf/src",
   ]
 }
diff --git a/trace_streamer/src/trace_data/trace_data_cache_base.h b/trace_streamer/src/trace_data/trace_data_cache_base.h
index 0a9fa64c168cab12fb2c6b5128d41a749a17af9f..bc780e17921aa7f521b422a36153155c37a58695 100644
--- a/trace_streamer/src/trace_data/trace_data_cache_base.h
+++ b/trace_streamer/src/trace_data/trace_data_cache_base.h
@@ -87,7 +87,7 @@ public:
     uint64_t traceEndTime_ = 0;
 
     Raw rawData_;
-    ThreadState threadStateData_;
+    ThreadStateData threadStateData_;
     Instants instantsData_;
 
     Filter filterData_;
diff --git a/trace_streamer/src/trace_data/trace_data_cache_reader.cpp b/trace_streamer/src/trace_data/trace_data_cache_reader.cpp
index 3f1166181ac32d1159bb90080df16f828a06e560..fa01a2a14f44bcee15c5315493324c10e9e54cc5 100644
--- a/trace_streamer/src/trace_data/trace_data_cache_reader.cpp
+++ b/trace_streamer/src/trace_data/trace_data_cache_reader.cpp
@@ -76,7 +76,7 @@ const ThreadMeasureFilter& TraceDataCacheReader::GetConstThreadMeasureFilterData
 {
     return threadMeasureFilterData_;
 }
-const ThreadState& TraceDataCacheReader::GetConstThreadStateData() const
+const ThreadStateData& TraceDataCacheReader::GetConstThreadStateData() const
 {
     return threadStateData_;
 }
diff --git a/trace_streamer/src/trace_data/trace_data_cache_reader.h b/trace_streamer/src/trace_data/trace_data_cache_reader.h
index 9894b31e1c4817e53adc4089b3b0931a883eabf5..fcf68491c0df2ef7bbc6ca6886d39e9b1ac1c487 100644
--- a/trace_streamer/src/trace_data/trace_data_cache_reader.h
+++ b/trace_streamer/src/trace_data/trace_data_cache_reader.h
@@ -44,7 +44,7 @@ public:
     const Measure& GetConstSysMemMeasureData() const;
     const Measure& GetConstProcessMeasureData() const;
     const ThreadMeasureFilter& GetConstThreadMeasureFilterData() const;
-    const ThreadState& GetConstThreadStateData() const;
+    const ThreadStateData& GetConstThreadStateData() const;
     const SchedSlice& GetConstSchedSliceData() const;
     const CpuMeasureFilter& GetConstCpuMeasureData() const;
     const ThreadMeasureFilter& GetConstThreadFilterData() const;
diff --git a/trace_streamer/src/trace_data/trace_data_cache_writer.cpp b/trace_streamer/src/trace_data/trace_data_cache_writer.cpp
index 6b8f616e920b4a3925989e10851ad0db30d08e59..cd2a2cf50b2715db69d2c4d5cb77fdeba278dbb6 100644
--- a/trace_streamer/src/trace_data/trace_data_cache_writer.cpp
+++ b/trace_streamer/src/trace_data/trace_data_cache_writer.cpp
@@ -117,7 +117,7 @@ Measure* TraceDataCacheWriter::GetProcessMeasureData()
     return &processMeasureData_;
 }
 
-ThreadState* TraceDataCacheWriter::GetThreadStateData()
+ThreadStateData* TraceDataCacheWriter::GetThreadStateData()
 {
     return &threadStateData_;
 }
diff --git a/trace_streamer/src/trace_data/trace_data_cache_writer.h b/trace_streamer/src/trace_data/trace_data_cache_writer.h
index bbfe38f9225cddb152ef2f0a5e841ba7f9b762d0..15f7793d91a8680d2215cc89e81e597d4cb437ff 100644
--- a/trace_streamer/src/trace_data/trace_data_cache_writer.h
+++ b/trace_streamer/src/trace_data/trace_data_cache_writer.h
@@ -44,7 +44,7 @@ public:
     Measure* GetMeasureData();
     Measure* GetSysMemMeasureData();
     Measure* GetProcessMeasureData();
-    ThreadState* GetThreadStateData();
+    ThreadStateData* GetThreadStateData();
     SchedSlice* GetSchedSliceData();
     CpuMeasureFilter* GetCpuMeasuresData();
     ThreadMeasureFilter* GetThreadMeasureFilterData();
diff --git a/trace_streamer/src/trace_data/trace_stdtype.cpp b/trace_streamer/src/trace_data/trace_stdtype.cpp
index 23d0614af95d04632079da2a02a507238c94674b..a2069f18c8121f5fb1079ac484e97075e0b0dbe7 100644
--- a/trace_streamer/src/trace_data/trace_stdtype.cpp
+++ b/trace_streamer/src/trace_data/trace_stdtype.cpp
@@ -15,10 +15,12 @@
 
 #include "trace_stdtype.h"
 #include <algorithm>
+#include <cmath>
 #include <ctime>
 namespace SysTuning {
 namespace TraceStdtype {
 const int32_t MAX_SIZE_LEN = 80;
+const int32_t ONE_MILLION_NANOSECONDS = 1000000;
 #define UNUSED(expr)             \
     do {                         \
         static_cast<void>(expr); \
@@ -27,11 +29,11 @@ void CpuCacheBase::SetDur(uint64_t index, uint64_t dur)
 {
     durs_[index] = dur;
 }
-TableRowId ThreadState::AppendThreadState(InternalTime ts,
-                                          InternalTime dur,
-                                          InternalCpu cpu,
-                                          InternalTid itid,
-                                          TableRowId idState)
+TableRowId ThreadStateData::AppendThreadState(InternalTime ts,
+                                              InternalTime dur,
+                                              InternalCpu cpu,
+                                              InternalTid itid,
+                                              TableRowId idState)
 {
     timeStamps_.emplace_back(ts);
     durations_.emplace_back(dur);
@@ -44,7 +46,7 @@ TableRowId ThreadState::AppendThreadState(InternalTime ts,
     return itids_.size() - 1;
 }
 
-void ThreadState::SetDuration(TableRowId index, InternalTime dur)
+void ThreadStateData::SetDuration(TableRowId index, InternalTime dur)
 {
     durations_[index] = dur;
 }
@@ -64,7 +66,7 @@ void DataDict::Finish()
         }
     }
 }
-TableRowId ThreadState::UpdateDuration(TableRowId index, InternalTime ts)
+TableRowId ThreadStateData::UpdateDuration(TableRowId index, InternalTime ts)
 {
     if (durations_[index] == INVALID_TIME) {
         durations_[index] = ts - timeStamps_[index];
@@ -72,7 +74,7 @@ TableRowId ThreadState::UpdateDuration(TableRowId index, InternalTime ts)
     return itids_[index];
 }
 
-bool ThreadState::End(TableRowId index, InternalTime ts)
+bool ThreadStateData::End(TableRowId index, InternalTime ts)
 {
     if (durations_[index] == INVALID_TIME) {
         durations_[index] = -1;
@@ -80,28 +82,28 @@ bool ThreadState::End(TableRowId index, InternalTime ts)
     }
     return true;
 }
-void ThreadState::UpdateState(TableRowId index, TableRowId idState)
+void ThreadStateData::UpdateState(TableRowId index, TableRowId idState)
 {
     states_[index] = idState;
 }
-void ThreadState::SetArgSetId(TableRowId index, uint32_t setId)
+void ThreadStateData::SetArgSetId(TableRowId index, uint32_t setId)
 {
     argSetIds_[index] = setId;
 }
 
-void ThreadState::UpdateDuration(TableRowId index, InternalTime ts, TableRowId idState)
+void ThreadStateData::UpdateDuration(TableRowId index, InternalTime ts, TableRowId idState)
 {
     durations_[index] = ts - timeStamps_[index];
     states_[index] = idState;
 }
 
-void ThreadState::UpdateTidAndPid(TableRowId index, InternalTid tid, InternalTid pid)
+void ThreadStateData::UpdateTidAndPid(TableRowId index, InternalTid tid, InternalTid pid)
 {
     tids_[index] = tid;
     pids_[index] = pid;
 }
 
-TableRowId ThreadState::UpdateDuration(TableRowId index, InternalTime ts, InternalCpu cpu, TableRowId idState)
+TableRowId ThreadStateData::UpdateDuration(TableRowId index, InternalTime ts, InternalCpu cpu, TableRowId idState)
 {
     cpus_[index] = cpu;
     durations_[index] = ts - timeStamps_[index];
@@ -2198,6 +2200,10 @@ void FrameSlice::SetSrcs(uint64_t row, const std::vector<uint64_t>& fromSlices)
     s.pop_back();
     srcs_[row] = s;
 }
+void FrameSlice::SetFlags(uint64_t row, const uint32_t flags)
+{
+    flags_[row] = flags;
+}
 const std::deque<uint32_t> FrameSlice::Ipids() const
 {
     return ipids_;
@@ -2251,18 +2257,27 @@ void FrameSlice::SetEndTimeAndFlag(uint64_t row, uint64_t ts, uint64_t expectDur
 {
     UNUSED(expectDur);
     durs_[row] = ts - timeStamps_[row];
-    flags_[row] = expectEnd >= ts ? 0 : 1;
+    if (flags_[row] != ABNORMAL_START_END_TIME) {
+        flags_[row] = expectEnd >= ts ? 0 : 1;
+    }
 }
 void FrameSlice::Erase(uint64_t row)
 {
     flags_[row] = INVALID_ROW;
 }
-size_t FrameMaps::AppendNew(uint64_t src, uint64_t dst)
+size_t FrameMaps::AppendNew(FrameSlice* frameSlice, uint64_t src, uint64_t dst)
 {
     timeStamps_.emplace_back(0);
     ids_.emplace_back(ids_.size());
     srcs_.push_back(src);
     dsts_.push_back(dst);
+    uint64_t rsStartTime = frameSlice->TimeStampData().at(dst);
+    uint64_t appEndTime = frameSlice->TimeStampData().at(src) + frameSlice->Durs().at(src);
+    auto typeDesc = frameSlice->Types().at(dst);
+    if (typeDesc == FrameSlice::ACTURAL_SLICE &&
+        std::abs(static_cast<long long>(rsStartTime - appEndTime)) >= ONE_MILLION_NANOSECONDS) {
+        frameSlice->SetFlags(dst, FrameSlice::ABNORMAL_START_END_TIME);
+    }
     return Size() - 1;
 }
 const std::deque<uint64_t>& FrameMaps::SrcIndexs() const
diff --git a/trace_streamer/src/trace_data/trace_stdtype.h b/trace_streamer/src/trace_data/trace_stdtype.h
index af60d5553b0ab43ea619ea92376545af77f83d47..fad6b00954c4ca590b17084f1a7e3d18766c11ba 100644
--- a/trace_streamer/src/trace_data/trace_stdtype.h
+++ b/trace_streamer/src/trace_data/trace_stdtype.h
@@ -117,7 +117,7 @@ public:
     uint32_t cpuStatesCount_ = 0;
 };
 
-class ThreadState {
+class ThreadStateData {
 public:
     TableRowId
         AppendThreadState(InternalTime ts, InternalTime dur, InternalCpu cpu, InternalTid itid, TableRowId idState);
@@ -1889,6 +1889,7 @@ public:
     void SetType(uint64_t row, uint8_t type);
     void SetDst(uint64_t row, uint64_t dst);
     void SetSrcs(uint64_t row, const std::vector<uint64_t>& fromSlices);
+    void SetFlags(uint64_t row, const uint32_t flags);
     const std::deque<uint32_t> Ipids() const;
     const std::deque<uint32_t> VsyncIds() const;
     const std::deque<uint64_t> CallStackIds() const;
@@ -1904,6 +1905,10 @@ public:
     void SetEndTimeAndFlag(uint64_t row, uint64_t ts, uint64_t expectDur, uint64_t expectEnd);
     void Erase(uint64_t row);
 
+public:
+    static const uint32_t ABNORMAL_START_END_TIME = 3;
+    typedef enum FrameSliceType { ACTURAL_SLICE, EXPECT_SLICE } FrameSliceType;
+
 private:
     std::deque<uint32_t> ipids_ = {};
     std::deque<uint64_t> dsts_ = {};
@@ -1920,7 +1925,7 @@ private:
 };
 class FrameMaps : public CacheBase {
 public:
-    size_t AppendNew(uint64_t src, uint64_t dst);
+    size_t AppendNew(FrameSlice* frameSlice, uint64_t src, uint64_t dst);
     const std::deque<uint64_t>& SrcIndexs() const;
     const std::deque<uint64_t>& DstIndexs() const;
 
diff --git a/trace_streamer/src/version.cpp b/trace_streamer/src/version.cpp
index 3cc6663c13caa5364a61467497ab7c6aa1c8132f..4a3a849f1ba57ccc40bcda8190811b9690b0b132 100644
--- a/trace_streamer/src/version.cpp
+++ b/trace_streamer/src/version.cpp
@@ -14,5 +14,5 @@
  */
 #include "version.h"
 size_t g_loadSize = 0;
-std::string TRACE_STREAM_VERSION = "3.2.7";            // version
-std::string TRACE_STREAM_PUBLISHVERSION = "2023/6/02"; // publish datetime
+std::string TRACE_STREAM_VERSION = "3.2.10";           // version
+std::string TRACE_STREAM_PUBLISHVERSION = "2023/6/25"; // publish datetime
diff --git a/trace_streamer/test/BUILD.gn b/trace_streamer/test/BUILD.gn
index 0da9525141fff8f4f699deb0f38d7b93a8e2a9a5..ce7ca3e1c97feeae084b208d63f76c1143bbc7b8 100755
--- a/trace_streamer/test/BUILD.gn
+++ b/trace_streamer/test/BUILD.gn
@@ -13,6 +13,7 @@
 
 import("../build/ohos.gni")
 import("../build/test.gni")
+import("../build/ts.gni")
 import("test_ts.gni")
 
 if (is_test) {
@@ -60,12 +61,23 @@ if (is_test) {
     ]
 
     deps = [
+      "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/cpu_data:cpu_data_cpp",
+      "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/diskio_data:diskio_data_cpp",
+      "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/ftrace_data/${device_kernel_version}:ftrace_data_cpp",
+      "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/hidump_data:hidump_data_cpp",
+      "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/hilog_data:hilog_data_cpp",
+      "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/hisysevent_data:hisysevent_data_cpp",
+      "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/js_memory:js_memory_data_cpp",
+      "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/memory_data:memory_data_cpp",
+      "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/native_hook:native_hook_cpp",
+      "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/network_data:network_data_cpp",
+      "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/process_data:process_data_cpp",
+      "${OHOS_TRACE_STREAMER_PROTOS_DIR}/protos/types/plugins/test_data:test_data_cpp",
       "${THIRD_PARTY}/googletest:gtest",
       "${THIRD_PARTY}/googletest:gtest_main",
       "${THIRD_PARTY}/protobuf:protobuf",
       "${THIRD_PARTY}/protobuf:protobuf_lite",
       "${THIRD_PARTY}/sqlite:sqlite",
-      "../prebuilts/protos:ts_proto_data_cpp",
       "../src:trace_streamer_source",
       "../src/parser/htrace_pbreader_parser:htrace_pbreader_parser",
       "../src/proto_reader:proto_reader",
@@ -95,20 +107,6 @@ if (is_test) {
       "${THIRD_PARTY}/protobuf/src/google/protobuf",
       "${THIRD_PARTY}/json-master/single_include/nlohmann",
       "${THIRD_PARTY}/perf_include/musl",
-      "${OHOS_PROTO_GEN}",
-      "${OHOS_PROTO_GEN}/types/plugins/ftrace_data/${kernel_version}",
-      "${OHOS_FTRACE_PROTO_DIR}",
-      "${OHOS_MEMORY_PROTO_DIR}",
-      "${OHOS_HILOG_PROTO_DIR}",
-      "${OHOS_NATIVE_HOOK_PROTO_DIR}",
-      "${OHOS_HIDUMP_PROTO_DIR}",
-      "${OHOS_NETWORK_PROTO_DIR}",
-      "${OHOS_DISKIO_PROTO_DIR}",
-      "${OHOS_CPUDATA_PROTO_DIR}",
-      "${OHOS_PROCESS_PROTO_DIR}",
-      "${OHOS_SERVICE_PROTO_DIR}",
-      "${OHOS_TEST_PROTO_DIR}",
-      "${OHOS_JSMEMORY_PROTO_DIR}",
       "../src/parser/htrace_pbreader_parser",
       "../src/parser/htrace_pbreader_parser/htrace_event_parser",
       "../src/parser/htrace_pbreader_parser/htrace_cpu_parser",
diff --git a/trace_streamer/test/test_fuzzer/bytrace_fuzzer/BUILD.gn b/trace_streamer/test/test_fuzzer/bytrace_fuzzer/BUILD.gn
index 71e641050c347d2514f77a185ec60e26ff6e6dea..97ed18a9aeef0d7d4af019d93b8c82ac15a3d601 100644
--- a/trace_streamer/test/test_fuzzer/bytrace_fuzzer/BUILD.gn
+++ b/trace_streamer/test/test_fuzzer/bytrace_fuzzer/BUILD.gn
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 #####################hydra-fuzz###################
-import("../../../build/ohos.gni")
+import("//build/ohos.gni")
 import("../../../build/test.gni")
 import("../../test_ts.gni")
 
@@ -27,21 +27,10 @@ ohos_fuzztest("ts_bytrace_fuzz_test") {
     "../../../src/parser",
     "../../../src/trace_streamer",
     "../../../src/include",
+    "../../../src/proto_reader/include",
     "../../../src/parser/bytrace_parser",
     "../../../src/cfg",
     "${THIRD_PARTY}/sqlite/include",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
-    "${OHOS_PROTO_GEN}/types/plugins/ftrace_data/${kernel_version}",
-    "${OHOS_PROTO_GEN}/types/plugins/hilog_data",
-    "${OHOS_PROTO_GEN}/types/plugins/native_hook",
-    "${OHOS_PROTO_GEN}/types/plugins/hidump_data",
-    "${OHOS_PROTO_GEN}/types/plugins/network_data",
-    "${OHOS_PROTO_GEN}/types/plugins/cpu_data",
-    "${OHOS_PROTO_GEN}/types/plugins/diskio_data",
-    "${OHOS_PROTO_GEN}/types/plugins/process_data",
-    "${OHOS_PROTO_GEN}/types/plugins/hisysevent_data",
-    "${OHOS_PROTO_GEN}/types/plugins/js_memory",
-    "${OHOS_PROTO_GEN}",
     "${THIRD_PARTY}/protobuf/src",
   ]
   cflags = [
@@ -60,8 +49,8 @@ ohos_fuzztest("ts_bytrace_fuzz_test") {
     "${THIRD_PARTY}/protobuf:protobuf",
     "${THIRD_PARTY}/protobuf:protobuf_lite",
     "${THIRD_PARTY}/sqlite:sqlite",
-    "../../../prebuilts/protos:ts_proto_data_cpp",
     "../../../src:trace_streamer_source",
+    "../../../src/proto_reader:proto_reader",
   ]
 }
 
diff --git a/trace_streamer/test/test_fuzzer/bytrace_fuzzer/bytrace_fuzzer.cpp b/trace_streamer/test/test_fuzzer/bytrace_fuzzer/bytrace_fuzzer.cpp
index 32bec6b19e3f0693c49f075bee939f2a25eaec89..f01d7f156aeee782e7f5e53afef2e3420bab6368 100644
--- a/trace_streamer/test/test_fuzzer/bytrace_fuzzer/bytrace_fuzzer.cpp
+++ b/trace_streamer/test/test_fuzzer/bytrace_fuzzer/bytrace_fuzzer.cpp
@@ -23,7 +23,6 @@
 
 namespace SysTuning {
 namespace TraceStreamer {
-using namespace SysTuning::base;
 bool BytraceParserFuzzTest(const uint8_t* data, size_t size)
 {
     if (!size) {
diff --git a/trace_streamer/test/test_fuzzer/htrace_fuzzer/BUILD.gn b/trace_streamer/test/test_fuzzer/htrace_fuzzer/BUILD.gn
index 368faa7e6cf9a10818525a6d2db2842519ceef8d..1bdfaf6d1a42356f162cd593ef8f1950a0b7f95f 100644
--- a/trace_streamer/test/test_fuzzer/htrace_fuzzer/BUILD.gn
+++ b/trace_streamer/test/test_fuzzer/htrace_fuzzer/BUILD.gn
@@ -12,13 +12,14 @@
 # limitations under the License.
 
 #####################hydra-fuzz###################
-import("../../../build/ohos.gni")
+import("//build/ohos.gni")
 import("../../../build/test.gni")
 import("../../test_ts.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("ts_htrace_fuzz_test") {
   include_dirs = [
+    "../../../src/proto_reader/include",
     "../../../src",
     "../../../src/base",
     "../../../src/table",
@@ -30,18 +31,6 @@ ohos_fuzztest("ts_htrace_fuzz_test") {
     "../../../src/parser/bytrace_parser",
     "../../../src/cfg",
     "${THIRD_PARTY}/sqlite/include",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
-    "${OHOS_PROTO_GEN}/types/plugins/ftrace_data/${kernel_version}",
-    "${OHOS_PROTO_GEN}/types/plugins/hilog_data",
-    "${OHOS_PROTO_GEN}/types/plugins/native_hook",
-    "${OHOS_PROTO_GEN}/types/plugins/hidump_data",
-    "${OHOS_PROTO_GEN}/types/plugins/network_data",
-    "${OHOS_PROTO_GEN}/types/plugins/cpu_data",
-    "${OHOS_PROTO_GEN}/types/plugins/diskio_data",
-    "${OHOS_PROTO_GEN}/types/plugins/process_data",
-    "${OHOS_PROTO_GEN}/types/plugins/hisysevent_data",
-    "${OHOS_PROTO_GEN}/types/plugins/js_memory",
-    "${OHOS_PROTO_GEN}",
     "${THIRD_PARTY}/protobuf/src",
   ]
   cflags = [
@@ -60,8 +49,8 @@ ohos_fuzztest("ts_htrace_fuzz_test") {
     "${THIRD_PARTY}/protobuf:protobuf",
     "${THIRD_PARTY}/protobuf:protobuf_lite",
     "${THIRD_PARTY}/sqlite:sqlite",
-    "../../../prebuilts/protos:ts_proto_data_cpp",
     "../../../src:trace_streamer_source",
+    "../../../src/proto_reader:proto_reader",
   ]
 }
 
diff --git a/trace_streamer/test/test_fuzzer/htrace_fuzzer/htrace_fuzzer.cpp b/trace_streamer/test/test_fuzzer/htrace_fuzzer/htrace_fuzzer.cpp
index b15c0b75163f4cd581878919f1d58c046843065b..e7a55e57ff9dc0ee837773c172a770591d670028 100644
--- a/trace_streamer/test/test_fuzzer/htrace_fuzzer/htrace_fuzzer.cpp
+++ b/trace_streamer/test/test_fuzzer/htrace_fuzzer/htrace_fuzzer.cpp
@@ -23,7 +23,6 @@
 
 namespace SysTuning {
 namespace TraceStreamer {
-using namespace SysTuning::base;
 bool HtraceParserFuzzTest(const uint8_t* data, size_t size)
 {
     TraceStreamerSelector stream_ = {};
diff --git a/trace_streamer/test/test_fuzzer/selector_fuzzer/BUILD.gn b/trace_streamer/test/test_fuzzer/selector_fuzzer/BUILD.gn
index e9ec6f09abf3a77b7aea34e658beeb9d3ec59f7b..146e2c73449e261b468bc62ee909185b7c026382 100644
--- a/trace_streamer/test/test_fuzzer/selector_fuzzer/BUILD.gn
+++ b/trace_streamer/test/test_fuzzer/selector_fuzzer/BUILD.gn
@@ -12,13 +12,14 @@
 # limitations under the License.
 
 #####################hydra-fuzz###################
-import("../../../build/ohos.gni")
+import("//build/ohos.gni")
 import("../../../build/test.gni")
 import("../../test_ts.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("ts_selector_fuzz_test") {
   include_dirs = [
+    "../../../src/proto_reader/include",
     "../../../src",
     "../../../src/base",
     "../../../src/table",
@@ -30,18 +31,6 @@ ohos_fuzztest("ts_selector_fuzz_test") {
     "../../../src/parser/bytrace_parser",
     "../../../src/cfg",
     "${THIRD_PARTY}/sqlite/include",
-    "${OHOS_PROTO_GEN}/types/plugins/memory_data",
-    "${OHOS_PROTO_GEN}/types/plugins/ftrace_data/${kernel_version}",
-    "${OHOS_PROTO_GEN}/types/plugins/hilog_data",
-    "${OHOS_PROTO_GEN}/types/plugins/native_hook",
-    "${OHOS_PROTO_GEN}/types/plugins/hidump_data",
-    "${OHOS_PROTO_GEN}/types/plugins/network_data",
-    "${OHOS_PROTO_GEN}/types/plugins/cpu_data",
-    "${OHOS_PROTO_GEN}/types/plugins/diskio_data",
-    "${OHOS_PROTO_GEN}/types/plugins/process_data",
-    "${OHOS_PROTO_GEN}/types/plugins/hisysevent_data",
-    "${OHOS_PROTO_GEN}/types/plugins/js_memory",
-    "${OHOS_PROTO_GEN}",
     "${THIRD_PARTY}/protobuf/src",
   ]
   cflags = [
@@ -57,11 +46,11 @@ ohos_fuzztest("ts_selector_fuzz_test") {
     "--coverage",
   ]
   deps = [
-    "${PREBUILTS}/protos:ts_proto_data_cpp",
     "${THIRD_PARTY}/protobuf:protobuf",
     "${THIRD_PARTY}/protobuf:protobuf_lite",
     "${THIRD_PARTY}/sqlite:sqlite",
     "../../../src:trace_streamer_source",
+    "../../../src/proto_reader:proto_reader",
   ]
 }
 
diff --git a/trace_streamer/test/test_fuzzer/selector_fuzzer/selector_fuzzer.cpp b/trace_streamer/test/test_fuzzer/selector_fuzzer/selector_fuzzer.cpp
index 4a50605929f00a6389cd59cb8420ecc7096b8d01..ce675b0fda5c0e5759b450742e7b62eb51408d75 100644
--- a/trace_streamer/test/test_fuzzer/selector_fuzzer/selector_fuzzer.cpp
+++ b/trace_streamer/test/test_fuzzer/selector_fuzzer/selector_fuzzer.cpp
@@ -23,7 +23,6 @@
 
 namespace SysTuning {
 namespace TraceStreamer {
-using namespace SysTuning::base;
 bool TraceStreamerSelectorFuzzTest(const uint8_t* data, size_t size)
 {
     TraceStreamerSelector stream_ = {};
diff --git a/trace_streamer/test/test_ts.gni b/trace_streamer/test/test_ts.gni
index c0c838b586643a99c2c3749b16e62405c7ddbe4c..e67c6457fc67fb4e7ec86485e7cccc6d215b70cd 100755
--- a/trace_streamer/test/test_ts.gni
+++ b/trace_streamer/test/test_ts.gni
@@ -16,38 +16,10 @@ THIRD_PARTY = "//third_party"
 SRC = "//src"
 PREBUILTS = "//prebuilts"
 if (target_os == "linux" || target_os == "windows" || target_os == "macx") {
-  OHOS_FTRACE_PROTO_DIR = "//src/multi_platform"
-  OHOS_MEMORY_PROTO_DIR = "//src/multi_platform"
-  OHOS_SERVICE_PROTO_DIR = "//src/multi_platform"
-  OHOS_PROTO_GEN = "//third_party/protogen"
   if (is_test) {
-    OHOS_MEMORY_PROTO_DIR = "$OHOS_PROTO_GEN/types/plugins/memory_data"
-    OHOS_NETWORK_PROTO_DIR = "$OHOS_PROTO_GEN/types/plugins/network_data"
-    OHOS_DISKIO_PROTO_DIR = "$OHOS_PROTO_GEN/types/plugins/diskio_data"
-    OHOS_CPUDATA_PROTO_DIR = "$OHOS_PROTO_GEN/types/plugins/cpu_data"
-    OHOS_PROCESS_PROTO_DIR = "$OHOS_PROTO_GEN/types/plugins/process_data"
-    OHOS_HISYSEVENT_PROTO_DIR = "$OHOS_PROTO_GEN/types/plugins/hisysevent_data"
-    OHOS_TEST_PROTO_DIR = "$OHOS_PROTO_GEN/types/plugins/test_data"
-    OHOS_JSMEMORY_PROTO_DIR = "$OHOS_PROTO_GEN/types/plugins/js_memory"
     enable_ts_utest = true
-    OHOS_HILOG_PROTO_DIR = "//src/multi_platform"
-    OHOS_NATIVE_HOOK_PROTO_DIR = "//src/multi_platform"
-    OHOS_HIDUMP_PROTO_DIR = "//src/multi_platform"
   }
 } else {
   use_wasm = false
-  OHOS_FTRACE_PROTO_DIR =
-      "//developtools/profiler/protos/types/plugins/ftrace_data"
-  OHOS_MEMORY_PROTO_DIR =
-      "//developtools/profiler/protos/types/plugins/memory_data"
-  OHOS_HILOG_PROTO_DIR =
-      "//developtools/profiler/protos/types/plugins/hilog_data"
-  OHOS_NATIVE_HOOK_PROTO_DIR =
-      "//developtools/profiler/protos/types/plugins/native_hook"
-  OHOS_HIDUMP_PROTO_DIR =
-      "//developtools/profiler/protos/types/plugins/hidump_data"
-  OHOS_SERVICE_PROTO_DIR = "//developtools/profiler/protos/services"
-  OHOS_PROTO_GEN =
-      "//developtools/profiler/trace_analyzer/third_party/protogen/"
   enable_ts_utest = true
 }
diff --git a/trace_streamer/test/unittest/htrace_event_parser_test.cpp b/trace_streamer/test/unittest/htrace_event_parser_test.cpp
index cc786b2a0a84c6f75d8b81647a205affdf7e2c3e..e447d6e770f3ba34d4e1d48e0abb5af78c161164 100644
--- a/trace_streamer/test/unittest/htrace_event_parser_test.cpp
+++ b/trace_streamer/test/unittest/htrace_event_parser_test.cpp
@@ -752,7 +752,7 @@ HWTEST_F(HtraceEventParserTest, ParseSysEnterEvent, TestSize.Level1)
     TS_LOGI("test14-18");
     SysEnterFormat* sysEnterEvent = new SysEnterFormat();
     sysEnterEvent->set_id(1);
-    sysEnterEvent->set_args(THREAD_NAME_02);
+    sysEnterEvent->set_args(0, 1);
 
     TracePluginResult tracePacket;
     FtraceCpuDetailMsg* ftraceCpuDetail = tracePacket.add_ftrace_cpu_detail();
diff --git a/trace_streamer/test/unittest/htrace_irq_event_test.cpp b/trace_streamer/test/unittest/htrace_irq_event_test.cpp
index de6964d5d2a31324cb3aa073c80f43c6320115fe..2a3b1f1e77936db9e6b23002f0aae2439c800eb5 100644
--- a/trace_streamer/test/unittest/htrace_irq_event_test.cpp
+++ b/trace_streamer/test/unittest/htrace_irq_event_test.cpp
@@ -23,7 +23,7 @@
 #include "trace_plugin_result.pbreader.h"
 #include "trace_streamer_selector.h"
 #include "ts_common.h"
-#include "types/plugins/ftrace_data/trace_plugin_result.pb.h"
+#include "trace_plugin_result.pb.h"
 
 using namespace testing::ext;
 using namespace SysTuning::TraceStreamer;
diff --git a/trace_streamer/test/unittest/js_memory_test.cpp b/trace_streamer/test/unittest/js_memory_test.cpp
index 2249c2265fb6c6f8e1c827bb682d2c0544989b86..bf80d5daab92dadbaab5b4998b728aabda6e0d13 100644
--- a/trace_streamer/test/unittest/js_memory_test.cpp
+++ b/trace_streamer/test/unittest/js_memory_test.cpp
@@ -24,10 +24,8 @@
 #include "file.h"
 #include "htrace_js_memory_parser.h"
 #include "js_heap_config.pb.h"
-#include "js_heap_config.pb.cc"
 #include "js_heap_config.pbreader.h"
 #include "js_heap_result.pb.h"
-#include "js_heap_result.pb.cc"
 #include "js_heap_result.pbreader.h"
 #include "trace_streamer_selector.h"
 
@@ -57,11 +55,11 @@ HWTEST_F(JsMemoryTest, snapshotParserNodesByJsmemory, TestSize.Level1)
 {
     TS_LOGI("test35-1");
     const int32_t pid = 1734;
-    JsHeapConfig jsHeapConfig;
-    jsHeapConfig.set_pid(pid);
-    jsHeapConfig.set_type(::JsHeapConfig_HeapType(0));
+    ArkTSConfig arkTSConfig;
+    arkTSConfig.set_pid(pid);
+    arkTSConfig.set_type(::ArkTSConfig_HeapType(0));
     std::string strConfig = "";
-    jsHeapConfig.SerializeToString(&strConfig);
+    arkTSConfig.SerializeToString(&strConfig);
 
     HtraceJSMemoryParser htraceJSMemoryParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get());
     ProtoReader::BytesView tracePacket(reinterpret_cast<const uint8_t*>(strConfig.data()), strConfig.size());
@@ -90,28 +88,28 @@ HWTEST_F(JsMemoryTest, snapshotParserNodesByJsmemory, TestSize.Level1)
         "\\n\\\"locations\\\":[],\\n\\\"samples\\\":[],\\n\\\"strings\\\":[],\\n\\\"trace_function_infos\\\":[],"
         "\\n\\\"trace_tree\\\":[]}\\n\"}}";
     const char* result4 = "{\"id\":1,\"result\":{}}";
-    JsHeapResult jsHeapResult1;
+    ArkTSResult jsHeapResult1;
     jsHeapResult1.set_result(result1);
     std::string strResult1 = "";
     jsHeapResult1.SerializeToString(&strResult1);
     ProtoReader::BytesView tracePacket1(reinterpret_cast<const uint8_t*>(strResult1.data()), strResult1.size());
     htraceJSMemoryParser.Parse(tracePacket1, 10000);
 
-    JsHeapResult jsHeapResult2;
+    ArkTSResult jsHeapResult2;
     jsHeapResult2.set_result(result2);
     std::string strResult2 = "";
     jsHeapResult2.SerializeToString(&strResult2);
     ProtoReader::BytesView tracePacket2(reinterpret_cast<const uint8_t*>(strResult2.data()), strResult2.size());
     htraceJSMemoryParser.Parse(tracePacket2, 11000);
 
-    JsHeapResult jsHeapResult3;
+    ArkTSResult jsHeapResult3;
     jsHeapResult3.set_result(result3);
     std::string strResult3 = "";
     jsHeapResult3.SerializeToString(&strResult3);
     ProtoReader::BytesView tracePacket3(reinterpret_cast<const uint8_t*>(strResult3.data()), strResult3.size());
     htraceJSMemoryParser.Parse(tracePacket3, 12000);
 
-    JsHeapResult jsHeapResult4;
+    ArkTSResult jsHeapResult4;
     jsHeapResult4.set_result(result4);
     std::string strResult4 = "";
     jsHeapResult4.SerializeToString(&strResult4);
@@ -149,11 +147,11 @@ HWTEST_F(JsMemoryTest, snapshotParserEdgesByJsmemory, TestSize.Level1)
 {
     TS_LOGI("test35-2");
     const int32_t pid = 1734;
-    JsHeapConfig jsHeapConfig;
-    jsHeapConfig.set_pid(pid);
-    jsHeapConfig.set_type(::JsHeapConfig_HeapType(0));
+    ArkTSConfig arkTSConfig;
+    arkTSConfig.set_pid(pid);
+    arkTSConfig.set_type(::ArkTSConfig_HeapType(0));
     std::string strConfig = "";
-    jsHeapConfig.SerializeToString(&strConfig);
+    arkTSConfig.SerializeToString(&strConfig);
 
     HtraceJSMemoryParser htraceJSMemoryParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get());
     ProtoReader::BytesView tracePacket(reinterpret_cast<const uint8_t*>(strConfig.data()), strConfig.size());
@@ -183,28 +181,28 @@ HWTEST_F(JsMemoryTest, snapshotParserEdgesByJsmemory, TestSize.Level1)
         "\\n\\\"locations\\\":[],\\n\\\"samples\\\":[],\\n\\\"strings\\\":[],\\n\\\"trace_function_infos\\\":[],"
         "\\n\\\"trace_tree\\\":[]}\\n\"}}";
     const char* result4 = "{\"id\":1,\"result\":{}}";
-    JsHeapResult jsHeapResult1;
+    ArkTSResult jsHeapResult1;
     jsHeapResult1.set_result(result1);
     std::string strResult1 = "";
     jsHeapResult1.SerializeToString(&strResult1);
     ProtoReader::BytesView tracePacket1(reinterpret_cast<const uint8_t*>(strResult1.data()), strResult1.size());
     htraceJSMemoryParser.Parse(tracePacket1, 10000);
 
-    JsHeapResult jsHeapResult2;
+    ArkTSResult jsHeapResult2;
     jsHeapResult2.set_result(result2);
     std::string strResult2 = "";
     jsHeapResult2.SerializeToString(&strResult2);
     ProtoReader::BytesView tracePacket2(reinterpret_cast<const uint8_t*>(strResult2.data()), strResult2.size());
     htraceJSMemoryParser.Parse(tracePacket2, 11000);
 
-    JsHeapResult jsHeapResult3;
+    ArkTSResult jsHeapResult3;
     jsHeapResult3.set_result(result3);
     std::string strResult3 = "";
     jsHeapResult3.SerializeToString(&strResult3);
     ProtoReader::BytesView tracePacket3(reinterpret_cast<const uint8_t*>(strResult3.data()), strResult3.size());
     htraceJSMemoryParser.Parse(tracePacket3, 12000);
 
-    JsHeapResult jsHeapResult4;
+    ArkTSResult jsHeapResult4;
     jsHeapResult4.set_result(result4);
     std::string strResult4 = "";
     jsHeapResult4.SerializeToString(&strResult4);
@@ -234,11 +232,11 @@ HWTEST_F(JsMemoryTest, timelineParserNodesByJsmemory, TestSize.Level1)
 {
     TS_LOGI("test35-3");
     const int32_t pid = 1734;
-    JsHeapConfig jsHeapConfig;
-    jsHeapConfig.set_pid(pid);
-    jsHeapConfig.set_type(::JsHeapConfig_HeapType(1));
+    ArkTSConfig arkTSConfig;
+    arkTSConfig.set_pid(pid);
+    arkTSConfig.set_type(::ArkTSConfig_HeapType(1));
     std::string strConfig = "";
-    jsHeapConfig.SerializeToString(&strConfig);
+    arkTSConfig.SerializeToString(&strConfig);
 
     HtraceJSMemoryParser htraceJSMemoryParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get());
     ProtoReader::BytesView tracePacket(reinterpret_cast<const uint8_t*>(strConfig.data()), strConfig.size());
@@ -266,28 +264,28 @@ HWTEST_F(JsMemoryTest, timelineParserNodesByJsmemory, TestSize.Level1)
         "\\n\\\"locations\\\":[],\\n\\\"samples\\\":[],\\n\\\"strings\\\":[],\\n\\\"trace_function_infos\\\":[],"
         "\\n\\\"trace_tree\\\":[]}\\n\"}}";
     const char* result4 = "{\"id\":2,\"result\":{}}";
-    JsHeapResult jsHeapResult1;
+    ArkTSResult jsHeapResult1;
     jsHeapResult1.set_result(result1);
     std::string strResult1 = "";
     jsHeapResult1.SerializeToString(&strResult1);
     ProtoReader::BytesView tracePacket1(reinterpret_cast<const uint8_t*>(strResult1.data()), strResult1.size());
     htraceJSMemoryParser.Parse(tracePacket1, 10000);
 
-    JsHeapResult jsHeapResult2;
+    ArkTSResult jsHeapResult2;
     jsHeapResult2.set_result(result2);
     std::string strResult2 = "";
     jsHeapResult2.SerializeToString(&strResult2);
     ProtoReader::BytesView tracePacket2(reinterpret_cast<const uint8_t*>(strResult2.data()), strResult2.size());
     htraceJSMemoryParser.Parse(tracePacket2, 11000);
 
-    JsHeapResult jsHeapResult3;
+    ArkTSResult jsHeapResult3;
     jsHeapResult3.set_result(result3);
     std::string strResult3 = "";
     jsHeapResult3.SerializeToString(&strResult3);
     ProtoReader::BytesView tracePacket3(reinterpret_cast<const uint8_t*>(strResult3.data()), strResult3.size());
     htraceJSMemoryParser.Parse(tracePacket3, 12000);
 
-    JsHeapResult jsHeapResult4;
+    ArkTSResult jsHeapResult4;
     jsHeapResult4.set_result(result4);
     std::string strResult4 = "";
     jsHeapResult4.SerializeToString(&strResult4);
@@ -325,11 +323,11 @@ HWTEST_F(JsMemoryTest, timelineParserEdgesByJsmemory, TestSize.Level1)
 {
     TS_LOGI("test35-4");
     const int32_t pid = 1734;
-    JsHeapConfig jsHeapConfig;
-    jsHeapConfig.set_pid(pid);
-    jsHeapConfig.set_type(::JsHeapConfig_HeapType(1));
+    ArkTSConfig arkTSConfig;
+    arkTSConfig.set_pid(pid);
+    arkTSConfig.set_type(::ArkTSConfig_HeapType(1));
     std::string strConfig = "";
-    jsHeapConfig.SerializeToString(&strConfig);
+    arkTSConfig.SerializeToString(&strConfig);
 
     HtraceJSMemoryParser htraceJSMemoryParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get());
     ProtoReader::BytesView tracePacket(reinterpret_cast<const uint8_t*>(strConfig.data()), strConfig.size());
@@ -358,28 +356,28 @@ HWTEST_F(JsMemoryTest, timelineParserEdgesByJsmemory, TestSize.Level1)
         "\\n\\\"locations\\\":[],\\n\\\"samples\\\":[],\\n\\\"strings\\\":[],\\n\\\"trace_function_infos\\\":[],"
         "\\n\\\"trace_tree\\\":[]}\\n\"}}";
     const char* result4 = "{\"id\":2,\"result\":{}}";
-    JsHeapResult jsHeapResult1;
+    ArkTSResult jsHeapResult1;
     jsHeapResult1.set_result(result1);
     std::string strResult1 = "";
     jsHeapResult1.SerializeToString(&strResult1);
     ProtoReader::BytesView tracePacket1(reinterpret_cast<const uint8_t*>(strResult1.data()), strResult1.size());
     htraceJSMemoryParser.Parse(tracePacket1, 10000);
 
-    JsHeapResult jsHeapResult2;
+    ArkTSResult jsHeapResult2;
     jsHeapResult2.set_result(result2);
     std::string strResult2 = "";
     jsHeapResult2.SerializeToString(&strResult2);
     ProtoReader::BytesView tracePacket2(reinterpret_cast<const uint8_t*>(strResult2.data()), strResult2.size());
     htraceJSMemoryParser.Parse(tracePacket2, 11000);
 
-    JsHeapResult jsHeapResult3;
+    ArkTSResult jsHeapResult3;
     jsHeapResult3.set_result(result3);
     std::string strResult3 = "";
     jsHeapResult3.SerializeToString(&strResult3);
     ProtoReader::BytesView tracePacket3(reinterpret_cast<const uint8_t*>(strResult3.data()), strResult3.size());
     htraceJSMemoryParser.Parse(tracePacket3, 12000);
 
-    JsHeapResult jsHeapResult4;
+    ArkTSResult jsHeapResult4;
     jsHeapResult4.set_result(result4);
     std::string strResult4 = "";
     jsHeapResult4.SerializeToString(&strResult4);
@@ -409,11 +407,11 @@ HWTEST_F(JsMemoryTest, timelineParserSamplesByJsmemory, TestSize.Level1)
 {
     TS_LOGI("test35-5");
     const int32_t pid = 1734;
-    JsHeapConfig jsHeapConfig;
-    jsHeapConfig.set_pid(pid);
-    jsHeapConfig.set_type(::JsHeapConfig_HeapType(1));
+    ArkTSConfig arkTSConfig;
+    arkTSConfig.set_pid(pid);
+    arkTSConfig.set_type(::ArkTSConfig_HeapType(1));
     std::string strConfig = "";
-    jsHeapConfig.SerializeToString(&strConfig);
+    arkTSConfig.SerializeToString(&strConfig);
 
     HtraceJSMemoryParser htraceJSMemoryParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get());
     ProtoReader::BytesView tracePacket(reinterpret_cast<const uint8_t*>(strConfig.data()), strConfig.size());
@@ -444,28 +442,28 @@ HWTEST_F(JsMemoryTest, timelineParserSamplesByJsmemory, TestSize.Level1)
         "42576\\n],\\n\\\"strings\\\":[],\\n\\\"trace_function_infos\\\":[],"
         "\\n\\\"trace_tree\\\":[]}\\n\"}}";
     const char* result4 = "{\"id\":2,\"result\":{}}";
-    JsHeapResult jsHeapResult1;
+    ArkTSResult jsHeapResult1;
     jsHeapResult1.set_result(result1);
     std::string strResult1 = "";
     jsHeapResult1.SerializeToString(&strResult1);
     ProtoReader::BytesView tracePacket1(reinterpret_cast<const uint8_t*>(strResult1.data()), strResult1.size());
     htraceJSMemoryParser.Parse(tracePacket1, 10000);
 
-    JsHeapResult jsHeapResult2;
+    ArkTSResult jsHeapResult2;
     jsHeapResult2.set_result(result2);
     std::string strResult2 = "";
     jsHeapResult2.SerializeToString(&strResult2);
     ProtoReader::BytesView tracePacket2(reinterpret_cast<const uint8_t*>(strResult2.data()), strResult2.size());
     htraceJSMemoryParser.Parse(tracePacket2, 11000);
 
-    JsHeapResult jsHeapResult3;
+    ArkTSResult jsHeapResult3;
     jsHeapResult3.set_result(result3);
     std::string strResult3 = "";
     jsHeapResult3.SerializeToString(&strResult3);
     ProtoReader::BytesView tracePacket3(reinterpret_cast<const uint8_t*>(strResult3.data()), strResult3.size());
     htraceJSMemoryParser.Parse(tracePacket3, 12000);
 
-    JsHeapResult jsHeapResult4;
+    ArkTSResult jsHeapResult4;
     jsHeapResult4.set_result(result4);
     std::string strResult4 = "";
     jsHeapResult4.SerializeToString(&strResult4);
@@ -495,11 +493,11 @@ HWTEST_F(JsMemoryTest, timelineParserStringsByJsmemory, TestSize.Level1)
 {
     TS_LOGI("test35-6");
     const int32_t pid = 1734;
-    JsHeapConfig jsHeapConfig;
-    jsHeapConfig.set_pid(pid);
-    jsHeapConfig.set_type(::JsHeapConfig_HeapType(1));
+    ArkTSConfig arkTSConfig;
+    arkTSConfig.set_pid(pid);
+    arkTSConfig.set_type(::ArkTSConfig_HeapType(1));
     std::string strConfig = "";
-    jsHeapConfig.SerializeToString(&strConfig);
+    arkTSConfig.SerializeToString(&strConfig);
 
     HtraceJSMemoryParser htraceJSMemoryParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get());
     ProtoReader::BytesView tracePacket(reinterpret_cast<const uint8_t*>(strConfig.data()), strConfig.size());
@@ -531,28 +529,28 @@ HWTEST_F(JsMemoryTest, timelineParserStringsByJsmemory, TestSize.Level1)
         "roots\\\",\\n\\\"TaggedDict[52]\\\",\\n\\\"JSFunction\\\"],\\n\\\"trace_function_infos\\\":[],"
         "\\n\\\"trace_tree\\\":[]}\\n\"}}";
     const char* result4 = "{\"id\":2,\"result\":{}}";
-    JsHeapResult jsHeapResult1;
+    ArkTSResult jsHeapResult1;
     jsHeapResult1.set_result(result1);
     std::string strResult1 = "";
     jsHeapResult1.SerializeToString(&strResult1);
     ProtoReader::BytesView tracePacket1(reinterpret_cast<const uint8_t*>(strResult1.data()), strResult1.size());
     htraceJSMemoryParser.Parse(tracePacket1, 10000);
 
-    JsHeapResult jsHeapResult2;
+    ArkTSResult jsHeapResult2;
     jsHeapResult2.set_result(result2);
     std::string strResult2 = "";
     jsHeapResult2.SerializeToString(&strResult2);
     ProtoReader::BytesView tracePacket2(reinterpret_cast<const uint8_t*>(strResult2.data()), strResult2.size());
     htraceJSMemoryParser.Parse(tracePacket2, 11000);
 
-    JsHeapResult jsHeapResult3;
+    ArkTSResult jsHeapResult3;
     jsHeapResult3.set_result(result3);
     std::string strResult3 = "";
     jsHeapResult3.SerializeToString(&strResult3);
     ProtoReader::BytesView tracePacket3(reinterpret_cast<const uint8_t*>(strResult3.data()), strResult3.size());
     htraceJSMemoryParser.Parse(tracePacket3, 12000);
 
-    JsHeapResult jsHeapResult4;
+    ArkTSResult jsHeapResult4;
     jsHeapResult4.set_result(result4);
     std::string strResult4 = "";
     jsHeapResult4.SerializeToString(&strResult4);
@@ -576,11 +574,11 @@ HWTEST_F(JsMemoryTest, timelineParserTraceFuncInfoByJsmemory, TestSize.Level1)
 {
     TS_LOGI("test35-7");
     const int32_t pid = 1734;
-    JsHeapConfig jsHeapConfig;
-    jsHeapConfig.set_pid(pid);
-    jsHeapConfig.set_type(::JsHeapConfig_HeapType(1));
+    ArkTSConfig arkTSConfig;
+    arkTSConfig.set_pid(pid);
+    arkTSConfig.set_type(::ArkTSConfig_HeapType(1));
     std::string strConfig = "";
-    jsHeapConfig.SerializeToString(&strConfig);
+    arkTSConfig.SerializeToString(&strConfig);
 
     HtraceJSMemoryParser htraceJSMemoryParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get());
     ProtoReader::BytesView tracePacket(reinterpret_cast<const uint8_t*>(strConfig.data()), strConfig.size());
@@ -611,28 +609,28 @@ HWTEST_F(JsMemoryTest, timelineParserTraceFuncInfoByJsmemory, TestSize.Level1)
         "0\\n],"
         "\\n\\\"trace_tree\\\":[]}\\n\"}}";
     const char* result4 = "{\"id\":2,\"result\":{}}";
-    JsHeapResult jsHeapResult1;
+    ArkTSResult jsHeapResult1;
     jsHeapResult1.set_result(result1);
     std::string strResult1 = "";
     jsHeapResult1.SerializeToString(&strResult1);
     ProtoReader::BytesView tracePacket1(reinterpret_cast<const uint8_t*>(strResult1.data()), strResult1.size());
     htraceJSMemoryParser.Parse(tracePacket1, 10000);
 
-    JsHeapResult jsHeapResult2;
+    ArkTSResult jsHeapResult2;
     jsHeapResult2.set_result(result2);
     std::string strResult2 = "";
     jsHeapResult2.SerializeToString(&strResult2);
     ProtoReader::BytesView tracePacket2(reinterpret_cast<const uint8_t*>(strResult2.data()), strResult2.size());
     htraceJSMemoryParser.Parse(tracePacket2, 11000);
 
-    JsHeapResult jsHeapResult3;
+    ArkTSResult jsHeapResult3;
     jsHeapResult3.set_result(result3);
     std::string strResult3 = "";
     jsHeapResult3.SerializeToString(&strResult3);
     ProtoReader::BytesView tracePacket3(reinterpret_cast<const uint8_t*>(strResult3.data()), strResult3.size());
     htraceJSMemoryParser.Parse(tracePacket3, 12000);
 
-    JsHeapResult jsHeapResult4;
+    ArkTSResult jsHeapResult4;
     jsHeapResult4.set_result(result4);
     std::string strResult4 = "";
     jsHeapResult4.SerializeToString(&strResult4);
@@ -658,11 +656,11 @@ HWTEST_F(JsMemoryTest, timelineParserTraceTreeByJsmemory, TestSize.Level1)
 {
     TS_LOGI("test35-8");
     const int32_t pid = 1734;
-    JsHeapConfig jsHeapConfig;
-    jsHeapConfig.set_pid(pid);
-    jsHeapConfig.set_type(::JsHeapConfig_HeapType(1));
+    ArkTSConfig arkTSConfig;
+    arkTSConfig.set_pid(pid);
+    arkTSConfig.set_type(::ArkTSConfig_HeapType(1));
     std::string strConfig = "";
-    jsHeapConfig.SerializeToString(&strConfig);
+    arkTSConfig.SerializeToString(&strConfig);
 
     HtraceJSMemoryParser htraceJSMemoryParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get());
     ProtoReader::BytesView tracePacket(reinterpret_cast<const uint8_t*>(strConfig.data()), strConfig.size());
@@ -696,28 +694,28 @@ HWTEST_F(JsMemoryTest, timelineParserTraceTreeByJsmemory, TestSize.Level1)
         "2,28,[]],16,15,5,188,[17,16,7,196,[]]]]],18,17,10,560,[19,9,2,28,[],20,18,172,7896,[21,19,4,3196,[]]]]]}\\n\"}"
         "}";
     const char* result4 = "{\"id\":2,\"result\":{}}";
-    JsHeapResult jsHeapResult1;
+    ArkTSResult jsHeapResult1;
     jsHeapResult1.set_result(result1);
     std::string strResult1 = "";
     jsHeapResult1.SerializeToString(&strResult1);
     ProtoReader::BytesView tracePacket1(reinterpret_cast<const uint8_t*>(strResult1.data()), strResult1.size());
     htraceJSMemoryParser.Parse(tracePacket1, 10000);
 
-    JsHeapResult jsHeapResult2;
+    ArkTSResult jsHeapResult2;
     jsHeapResult2.set_result(result2);
     std::string strResult2 = "";
     jsHeapResult2.SerializeToString(&strResult2);
     ProtoReader::BytesView tracePacket2(reinterpret_cast<const uint8_t*>(strResult2.data()), strResult2.size());
     htraceJSMemoryParser.Parse(tracePacket2, 11000);
 
-    JsHeapResult jsHeapResult3;
+    ArkTSResult jsHeapResult3;
     jsHeapResult3.set_result(result3);
     std::string strResult3 = "";
     jsHeapResult3.SerializeToString(&strResult3);
     ProtoReader::BytesView tracePacket3(reinterpret_cast<const uint8_t*>(strResult3.data()), strResult3.size());
     htraceJSMemoryParser.Parse(tracePacket3, 12000);
 
-    JsHeapResult jsHeapResult4;
+    ArkTSResult jsHeapResult4;
     jsHeapResult4.set_result(result4);
     std::string strResult4 = "";
     jsHeapResult4.SerializeToString(&strResult4);
diff --git a/trace_streamer/test/unittest/proto_reader_test.cpp b/trace_streamer/test/unittest/proto_reader_test.cpp
index 4b5d39049221d92a1f395fb80a44ebe0a76864a7..dd9d29d069764d43aaff415c524085186ca9121f 100644
--- a/trace_streamer/test/unittest/proto_reader_test.cpp
+++ b/trace_streamer/test/unittest/proto_reader_test.cpp
@@ -23,7 +23,6 @@
 
 #include "file.h"
 #include "test.pb.h"
-#include "test.pb.cc"
 #include "test.pbreader.h"
 #include "trace_streamer_selector.h"