From 2b23bd61d28b17ef528dbbb10a6ebdbd106b5882 Mon Sep 17 00:00:00 2001
From: zhangzhuozhou <zhangzhuozhou@huawei.com>
Date: Sat, 29 Mar 2025 18:08:29 +0800
Subject: [PATCH 01/13] =?UTF-8?q?feat:=E9=80=82=E9=85=8D=E5=A4=A7=E6=A1=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=B9=B6=E8=A1=8C=E5=8C=96trace=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangzhuozhou <zhangzhuozhou@huawei.com>
---
 trace_streamer/src/filter/frame_filter.cpp    |  9 ++++++--
 trace_streamer/src/filter/frame_filter.h      |  3 +--
 .../src/parser/print_event_parser.cpp         | 23 ++-----------------
 .../src/parser/print_event_parser.h           |  1 -
 4 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/trace_streamer/src/filter/frame_filter.cpp b/trace_streamer/src/filter/frame_filter.cpp
index 751216890..e531cb6ff 100644
--- a/trace_streamer/src/filter/frame_filter.cpp
+++ b/trace_streamer/src/filter/frame_filter.cpp
@@ -62,14 +62,19 @@ void FrameFilter::BeginVsyncEvent(const BytraceLine &line,
         vsyncRenderSlice_[itid] = frameVec;
     }
 }
-void FrameFilter::BeginUVTraceEvent(const BytraceLine &line, uint32_t callStackSliceId)
+void FrameFilter::BeginParallelTraceEvent(const BytraceLine &line, uint32_t callStackSliceId)
 {
     auto frame = std::make_shared<FrameSlice>();
     frame->startTs_ = line.ts;
     frame->callStackSliceId_ = callStackSliceId;
-    frame->isUVTrace_ = true;
     auto itid = streamFilters_->processFilter_->GetInternalTid(line.pid);
     auto ipid = streamFilters_->processFilter_->GetInternalPid(line.tgid);
+    auto process = traceDataCache_->GetProcessData(ipid);
+    auto mainThreadId = process->pid_;
+    if (mainThreadId == line.pid) {
+        TS_LOGI("Only deal with the events which are not on main thread.");
+        return;
+    }
     frame->frameSliceRow_ =
         traceDataCache_->GetFrameSliceData()->AppendFrame(line.ts, ipid, itid, INVALID_UINT32, callStackSliceId);
 
diff --git a/trace_streamer/src/filter/frame_filter.h b/trace_streamer/src/filter/frame_filter.h
index 3f259ab2c..128a94481 100644
--- a/trace_streamer/src/filter/frame_filter.h
+++ b/trace_streamer/src/filter/frame_filter.h
@@ -47,7 +47,7 @@ public:
     bool StartFrameQueue(uint64_t ts, uint32_t itid);
     bool EndFrameQueue(uint64_t ts, uint32_t itid);
     bool UpdateVsyncId(const BytraceLine &line, uint32_t vsyncId, uint64_t timeId);
-    void BeginUVTraceEvent(const BytraceLine &line, uint32_t callStackSliceId);
+    void BeginParallelTraceEvent(const BytraceLine &line, uint32_t callStackSliceId);
     void Clear();
     void SetTraceType(TraceFileType traceType);
     void UpdateReadySize()
@@ -86,7 +86,6 @@ private:
         std::vector<uint64_t> sourceExpectedSlice_ = {};
         uint64_t dstFrameSliceId_ = INVALID_UINT64;
         uint64_t dstExpectedFrameSliceId_ = INVALID_UINT64;
-        bool isUVTrace_ = false;
         bool isEnd_ = false;
         uint64_t nowId_ = INVALID_UINT64;
     };
diff --git a/trace_streamer/src/parser/print_event_parser.cpp b/trace_streamer/src/parser/print_event_parser.cpp
index e98e6ffa4..a72718144 100644
--- a/trace_streamer/src/parser/print_event_parser.cpp
+++ b/trace_streamer/src/parser/print_event_parser.cpp
@@ -38,9 +38,7 @@ PrintEventParser::PrintEventParser(TraceDataCache *dataCache, const TraceStreame
         {marshRwTransactionData_, bind(&PrintEventParser::OnRwTransaction, this, std::placeholders::_1,
                                        std::placeholders::_2, std::placeholders::_3)},
         {rsMainThreadProcessCmd_, bind(&PrintEventParser::OnMainThreadProcessCmd, this, std::placeholders::_1,
-                                       std::placeholders::_2, std::placeholders::_3)},
-        {uvTrace_, bind(&PrintEventParser::DealUvTraceEvent, this, std::placeholders::_1, std::placeholders::_2,
-                        std::placeholders::_3)}};
+                                       std::placeholders::_2, std::placeholders::_3)}};
 }
 
 bool PrintEventParser::ParsePrintEvent(const std::string &comm,
@@ -333,21 +331,6 @@ bool PrintEventParser::ReciveVsync(size_t callStackRow, std::string &args, const
     return true;
 }
 
-bool PrintEventParser::DealUvTraceEvent(size_t callStackRow, std::string &args, const BytraceLine &line)
-{
-    Unused(args);
-    // deal H:UV_TRACE event, this event's thread is not main thread.
-    // this event do not has expect now and end.
-    streamFilters_->frameFilter_->BeginUVTraceEvent(line, callStackRow);
-    auto iTid = streamFilters_->processFilter_->GetInternalTid(line.pid);
-    if (vsyncSliceMap_.count(iTid)) {
-        vsyncSliceMap_[iTid].push_back(callStackRow);
-    } else {
-        vsyncSliceMap_[iTid] = {callStackRow};
-    }
-    return true;
-}
-
 bool PrintEventParser::DealUIVsyncTaskEvent(DataIndex eventName, const BytraceLine &line)
 {
     auto eventNameStr = traceDataCache_->GetDataFromDict(eventName);
@@ -372,10 +355,8 @@ bool PrintEventParser::DealUIVsyncTaskEvent(DataIndex eventName, const BytraceLi
 bool PrintEventParser::OnVsyncEvent(size_t callStackRow, std::string &args, const BytraceLine &line)
 {
     Unused(args);
+    streamFilters_->frameFilter_->BeginParallelTraceEvent(line, callStackRow);
     auto iTid = streamFilters_->processFilter_->GetInternalTid(line.pid);
-    if (!vsyncSliceMap_.count(iTid)) {
-        return false;
-    }
     // when there are mutiple nested OnVsyncEvent,only handle the OnvsyncEvent of the next layer under ReceiveVsync
     if (vsyncSliceMap_[iTid].size() >= maxVsyncEventSize_) {
         return false;
diff --git a/trace_streamer/src/parser/print_event_parser.h b/trace_streamer/src/parser/print_event_parser.h
index a8238f1da..2a6aab552 100644
--- a/trace_streamer/src/parser/print_event_parser.h
+++ b/trace_streamer/src/parser/print_event_parser.h
@@ -88,7 +88,6 @@ private:
     TraceStreamerConfig config_{};
     const DataIndex recvievVsync_ = traceDataCache_->GetDataIndex("H:ReceiveVsync");
     const DataIndex onVsyncEvent_ = traceDataCache_->GetDataIndex("H:OnVsyncEvent");
-    const DataIndex uvTrace_ = traceDataCache_->GetDataIndex("H:UV_TRACE");
     const std::string uiVsyncTaskStr_ = "H:UIVsyncTask";
     const std::string rsOnDoCompositionStr_ = "H:RSMainThread::DoComposition";
     DataIndex rsOnDoCompositionEvent_ = INVALID_DATAINDEX;
-- 
Gitee


From e78d84fd619797d1c3b12036e255a031044ab3f3 Mon Sep 17 00:00:00 2001
From: wangziyi <wangziyi40@huawei.com>
Date: Wed, 2 Apr 2025 10:28:47 +0800
Subject: [PATCH 02/13] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5so=E9=A1=B5=E9=9D=A2=E4=B8=8D=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangziyi <wangziyi40@huawei.com>
---
 .../trace/component/trace/base/TraceSheet.ts    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/ide/src/trace/component/trace/base/TraceSheet.ts b/ide/src/trace/component/trace/base/TraceSheet.ts
index 21bf2ec59..b883b1b33 100644
--- a/ide/src/trace/component/trace/base/TraceSheet.ts
+++ b/ide/src/trace/component/trace/base/TraceSheet.ts
@@ -104,8 +104,8 @@ import { XpowerThreadInfoStruct } from '../../../database/ui-worker/ProcedureWor
 import { TabPaneXpowerThreadInfoSelection } from '../sheet/xpower/TabPaneXpowerThreadInfoSelection';
 import { TabPaneXpowerGpuFreqSelection } from '../sheet/xpower/TabPaneXpowerGpuFreqSelection';
 import { XpowerGpuFreqStruct } from '../../../database/ui-worker/ProcedureWorkerXpowerGpuFreq';
-import { WebSocketManager} from '../../../../webSocket/WebSocketManager';
-import { Constants, TypeConstants} from '../../../../webSocket/Constants';
+import { WebSocketManager } from '../../../../webSocket/WebSocketManager';
+import { Constants, TypeConstants } from '../../../../webSocket/Constants';
 import { PerfFunctionAsmParam } from '../../../bean/PerfAnalysis';
 import { info, error } from '../../../../log/Log';
 import { XpowerThreadCountStruct } from '../../../database/ui-worker/ProcedureWorkerXpowerThreadCount';
@@ -138,6 +138,7 @@ export class TraceSheet extends BaseElement {
   private spsystemTrace: SpSystemTrace | undefined;
   private isDragging = true;
   private REQ_BUF_SIZE = 1024 * 1024;
+  private loadSoComplete = false;
 
   static get observedAttributes(): string[] {
     return ['mode'];
@@ -613,12 +614,13 @@ export class TraceSheet extends BaseElement {
         }
         if (fileList.length > 0) {
           importFileBt!.disabled = true;
+          this.loadSoComplete = false;
           window.publish(window.SmartEvent.UI.Loading, { loading: true, text: 'Import So File' });
           this.uploadSoOrAN(fileList).then(r => {
             // @ts-ignore
             document.querySelector('body > sp-application').shadowRoot.querySelector('#sp-system-trace').shadowRoot.querySelector('div > trace-sheet').shadowRoot.querySelector('#box-perf-analysis > tabpane-perf-analysis').shadowRoot.querySelector('#SO-err-tips')?.innerHTML = '';
-            let  soFileList = fileList.filter(item => !item.name.includes('.an'));
-            if(soFileList.length === 0) {
+            let soFileList = fileList.filter(item => !item.name.includes('.an'));
+            if (soFileList.length === 0) {
               window.publish(window.SmartEvent.UI.UploadSOFile, {});
               importFileBt!.disabled = false;
               return;
@@ -631,6 +633,7 @@ export class TraceSheet extends BaseElement {
                 importFileBt!.disabled = false; // @ts-ignore
                 if (res.result === 'ok') {
                   window.publish(window.SmartEvent.UI.UploadSOFile, {});
+                  this.loadSoComplete = true;
                 } else {
                   // @ts-ignore
                   const failedList = res.failedArray.join(',');
@@ -1183,6 +1186,12 @@ export class TraceSheet extends BaseElement {
       });
     if (restore) {
       if (this.litTabs?.activekey) {
+        if (this.loadSoComplete) {
+          let analysisTabpane = this.shadowRoot!.querySelector('#box-perf-analysis') as LitTabpane;
+          if (analysisTabpane && this.litTabs) {
+            this.litTabs.activekey = analysisTabpane.key;
+          }
+        }
         this.loadTabPaneData(this.litTabs?.activekey);
         this.setMode('max');
         return true;
-- 
Gitee


From 304c5dfbb98dc7b3e4ed3fe299a4c4d261b3330e Mon Sep 17 00:00:00 2001
From: wangyujie <wangyujie38@huawei.com>
Date: Thu, 3 Apr 2025 14:49:25 +0800
Subject: [PATCH 03/13] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dhiperf=E9=BD=BF?=
 =?UTF-8?q?=E8=BD=AE=E6=93=8D=E4=BD=9C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangyujie <wangyujie38@huawei.com>
---
 ide/src/base-ui/popover/LitPopoverV.ts        | 11 +++++++--
 ide/src/trace/component/trace/SpChartList.ts  | 23 +++++++++++++++++++
 .../trace/component/trace/base/TraceRow.ts    |  5 ++++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/ide/src/base-ui/popover/LitPopoverV.ts b/ide/src/base-ui/popover/LitPopoverV.ts
index adf8163c7..23669857e 100644
--- a/ide/src/base-ui/popover/LitPopoverV.ts
+++ b/ide/src/base-ui/popover/LitPopoverV.ts
@@ -17,6 +17,7 @@ import { BaseElement, element } from '../BaseElement';
 import { replacePlaceholders } from '../utils/Template';
 import { SpSystemTrace } from '../../trace/component/SpSystemTrace';
 import { SpChartList } from '../../trace/component/trace/SpChartList';
+import { dpr } from '../../trace/component/trace/base/Extension';
 let css = `
 <style>
     :host{ 
@@ -369,6 +370,8 @@ const initHtmlStyle = (wid: string): string => {
 
 @element('lit-popover')
 export class LitPopover extends BaseElement {
+  static isChangeHeight: boolean = false;
+  static finalHeight: number = 0;
   static get observedAttributes(): string[] {
     return ['title', 'trigger', 'width', 'placement', 'visible'];
   }
@@ -468,7 +471,6 @@ export class LitPopover extends BaseElement {
         let isHiperf = sp.collectRows.some((row) => {
           return row.rowId === 'HiPerf-callchart' && row.rowParentId === 'HiPerf';
         });
-        let isResetHeight = parseFloat(favoriteList.style.height.replace('px', '')) >= 300;
         let rowHeight = sp.collectRows.reduce((pre, row) => {
           let height = row._frame?.height;
           return pre + height!;
@@ -477,7 +479,12 @@ export class LitPopover extends BaseElement {
         if (sp.collectEl1!.innerHTML.trim() !== '' && sp.collectEl2!.innerHTML.trim() !== '') {
           titleHeight = titleHeight * 2;
         }
-        favoriteList.style.height = this.visible === 'true' && isHiperf && !isResetHeight ? '300px' : `${rowHeight + titleHeight}px`;
+        let favoriteListHeight = favoriteList!.clientHeight * dpr();
+        let finalHeight = rowHeight + titleHeight > favoriteListHeight ? favoriteListHeight : rowHeight + titleHeight;
+        let isResetHeight = parseFloat(favoriteList.style.height.replace('px', '')) >= 300 && finalHeight >= 300;
+        favoriteList.style.height = this.visible === 'true' && isHiperf && !isResetHeight ? '300px' : `${finalHeight}px`;
+        LitPopover.isChangeHeight = this.visible === 'true' && isHiperf && !isResetHeight ? true : false;
+        LitPopover.finalHeight = finalHeight;
       }
     }; // @ts-ignore
     popover.onmouseleave = (): void => {
diff --git a/ide/src/trace/component/trace/SpChartList.ts b/ide/src/trace/component/trace/SpChartList.ts
index 416e36be5..4dcd9bd97 100644
--- a/ide/src/trace/component/trace/SpChartList.ts
+++ b/ide/src/trace/component/trace/SpChartList.ts
@@ -32,6 +32,7 @@ import { CpuStruct } from '../../database/ui-worker/cpu/ProcedureWorkerCPU';
 import { WakeupBean } from '../../bean/WakeupBean';
 import { LitIcon } from '../../../base-ui/icon/LitIcon';
 import { SpSystemTrace } from '../SpSystemTrace';
+import { LitPopover } from '../../../base-ui/popover/LitPopoverV';
 
 const maxScale = 0.8; //收藏最大高度为界面最大高度的80%
 const topHeight = 150; // 顶部cpu使用率部分高度固定为150px
@@ -629,10 +630,32 @@ export class SpChartList extends BaseElement {
   }
 
   refreshFavoriteCanvas(): void {
+    let sp = document.querySelector("body > sp-application")?.shadowRoot?.querySelector("#sp-system-trace") as SpSystemTrace;
+    let favoriteList = sp.shadowRoot?.querySelector("#favorite-chart-list") as SpChartList;
+    let popover = (favoriteList.shadowRoot?.querySelector("#collect-group-1 > trace-row")?.shadowRoot?.querySelector("#rowSetting") || favoriteList.shadowRoot?.querySelector("#collect-group-2 > trace-row")?.shadowRoot?.querySelector("#rowSetting")) as LitPopover;
+    let spChartList = document.querySelector("body > sp-application")?.shadowRoot?.querySelector("#sp-system-trace")?.shadowRoot?.querySelector("#favorite-chart-list");
     this.canvas!.style.width = `${this.clientWidth - 248}px`;
     this.canvas!.style.left = `248px`;
     this.canvas!.width = this.canvas?.clientWidth! * dpr();
     this.canvas!.height = this.clientHeight * dpr();
+    if (sp.collectRows && sp.collectRows.length) {
+      let isHiperf = sp.collectRows.some((row) => {
+        return row.rowId === 'HiPerf-callchart' && row.rowParentId === 'HiPerf';
+      });
+      let rowHeight = sp.collectRows.reduce((pre, row) => {
+        let height = row._frame?.height;
+        return pre + height!;
+      }, 0);
+      let titleHeight = sp.groupTitle1!.clientHeight || sp.groupTitle2!.clientHeight;
+      if (sp.collectEl1!.innerHTML.trim() !== '' && sp.collectEl2!.innerHTML.trim() !== '') {
+        titleHeight = titleHeight * 2;
+      }
+      let spChartListHeight = spChartList!.clientHeight * dpr();
+      let finalHeight = rowHeight + titleHeight > spChartListHeight ? spChartListHeight : rowHeight + titleHeight;
+      if (popover && isHiperf) {
+        favoriteList.style.height = popover.visible === 'true' ? `${this.canvas!.height}px` : `${finalHeight}px`;
+      }
+    }
     this.canvas!.getContext('2d')!.scale(dpr(), dpr());
     window.publish(window.SmartEvent.UI.RefreshCanvas, {});
   }
diff --git a/ide/src/trace/component/trace/base/TraceRow.ts b/ide/src/trace/component/trace/base/TraceRow.ts
index 752e0a844..a13db4ae9 100644
--- a/ide/src/trace/component/trace/base/TraceRow.ts
+++ b/ide/src/trace/component/trace/base/TraceRow.ts
@@ -33,6 +33,7 @@ import { type TreeItemData, LitTree } from '../../../../base-ui/tree/LitTree';
 import { SpSystemTrace } from '../../SpSystemTrace';
 import { TraceRowHtml } from './TraceRow.html';
 import { Utils } from './Utils';
+import { SpChartList } from '../SpChartList';
 
 export class RangeSelectStruct {
   startX: number | undefined;
@@ -1074,6 +1075,7 @@ export class TraceRow<T extends BaseStruct> extends HTMLElement {
 
   addRowSettingPop(): void {
     let nameEl = this.shadowRoot && (this.shadowRoot.querySelector('.name') as HTMLLabelElement);
+    let favoriteList = this.trace!.shadowRoot?.querySelector("#favorite-chart-list") as SpChartList;
     nameEl && (nameEl.style.maxWidth = '160px');
     let collectEl = (this.shadowRoot && this.shadowRoot.querySelector('.collect') as LitIcon);
     collectEl && (collectEl.style.marginRight = '20px');
@@ -1101,6 +1103,9 @@ export class TraceRow<T extends BaseStruct> extends HTMLElement {
       this.rowSettingPop!.visible = isVisible;
       TraceRow.ROW_TYPE_HIPERF_THREADTYPE.push(Number(this.rowSettingTree!.getCheckdKeys())); //@ts-ignore
       this.onRowSettingChangeHandler?.(this.rowSettingTree!.getCheckdKeys(), this.rowSettingTree!.getCheckdNodes());
+      if (LitPopover) {
+        favoriteList.style.height = LitPopover.isChangeHeight ? `${LitPopover.finalHeight}px` : '300px';
+      }
     };
     this.rowSettingPop?.addEventListener('mouseenter', (): void => {
       window.publish(window.SmartEvent.UI.HoverNull, undefined);
-- 
Gitee


From c7ac1fc1441418691dc83abf77e426b6ee474f31 Mon Sep 17 00:00:00 2001
From: danghongquan <danghongquan3@huawei.com>
Date: Mon, 7 Apr 2025 15:50:13 +0800
Subject: [PATCH 04/13] =?UTF-8?q?fix:=E5=A4=84=E7=90=86=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E5=8D=A0=E7=94=A8=E9=97=AE=E9=A2=98&&=E6=89=A9=E5=B1=95?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: danghongquan <danghongquan3@huawei.com>
---
 ide/src/doc/quickstart_extensions.html        |  2 +-
 .../trace/component/trace/base/TraceSheet.ts  |  7 +++++--
 .../trace/sheet/hiperf/TabPanePerfAnalysis.ts | 19 ++++++++++++-------
 ide/src/webSocket/WebSocketManager.ts         | 13 ++++++++++---
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/ide/src/doc/quickstart_extensions.html b/ide/src/doc/quickstart_extensions.html
index 390bc808c..fab0d8479 100644
--- a/ide/src/doc/quickstart_extensions.html
+++ b/ide/src/doc/quickstart_extensions.html
@@ -811,7 +811,7 @@
             在hi-smart-perf-host-extend目录下，找到stop.bat文件，右键选择以管理员身份运行，即可关闭扩展服务。
         </p>
         <p class="fontColor" style="font-weight: bold">
-            备注：当前扩展服务版本为1.1.1，如果本地存在以其他方式安装的非正式版本，请手动关闭扩展服务，并重新按照该指导安装
+            备注：当前扩展服务版本为1.1.2，如果本地存在以其他方式安装的非正式版本，请手动关闭扩展服务，并重新按照该指导安装
         </p>
     </div>
 
diff --git a/ide/src/trace/component/trace/base/TraceSheet.ts b/ide/src/trace/component/trace/base/TraceSheet.ts
index b883b1b33..c16465188 100644
--- a/ide/src/trace/component/trace/base/TraceSheet.ts
+++ b/ide/src/trace/component/trace/base/TraceSheet.ts
@@ -316,8 +316,11 @@ export class TraceSheet extends BaseElement {
     this.currentPaneID = 'box-perf-analysis';
     //隐藏除了当前Tab页的其他Tab页
     this.shadowRoot!.querySelectorAll<LitTabpane>('lit-tabpane').forEach(
-      (it): boolean =>
-        it.id !== this.currentPaneID ? (it.hidden = true) : (it.hidden = false)
+      (it)=>{
+        if(it.id === this.currentPaneID) {
+          it.hidden = false;
+        }
+      }
     );
     let asmPane = this.getPaneByID('tab-perf-func-asm'); //通过Id找到需要展示的Tab页
     asmPane.closeable = true;
diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts
index c272cea5f..c04d2ce91 100644
--- a/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts
+++ b/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts
@@ -582,18 +582,18 @@ export class TabPanePerfAnalysis extends BaseElement {
   callback = (cmd: number, e: Uint8Array): unknown => {
     if (cmd === Constants.DISASSEMBLY_QUERY_ELF_CMD) {
       const result = JSON.parse(new TextDecoder().decode(e));
-      if(result.resultCode !== 0){
+      if (result.resultCode !== 0) {
         // @ts-ignore
         this.perfAnalysisHeadTips?.innerHTML = result.resultMessage;
       }
-      WebSocketManager.getInstance()?.unregisterCallback(TypeConstants.DISASSEMBLY_TYPE,this.callback);
+      WebSocketManager.getInstance()?.unregisterCallback(TypeConstants.DISASSEMBLY_TYPE, this.callback);
     }
   }
 
   private functionClickEvent(it: unknown) {
     // @ts-ignore
     this.perfAnalysisHeadTips?.innerHTML = '';
-    if(this.selectedTabfileName.indexOf('.an') === -1 && this.selectedTabfileName.indexOf('.so') === -1) {
+    if (this.selectedTabfileName.indexOf('.an') === -1 && this.selectedTabfileName.indexOf('.so') === -1) {
       // @ts-ignore
       this.perfAnalysisHeadTips?.innerHTML = 'Call stack assembly-level parsing of non-.an and .so files is not supported.';
       return;
@@ -613,19 +613,24 @@ export class TabPanePerfAnalysis extends BaseElement {
     if (this.clickFuncVaddrList.length > 0) {
       const textEncoder = new TextEncoder();
       const queryData = {
-        elf_name: this.currentSoName,  
+        elf_name: this.currentSoName,
         //@ts-ignore
-        vaddr: this.clickFuncVaddrList[0].vaddrInFile,  
+        vaddr: this.clickFuncVaddrList[0].vaddrInFile,
         //@ts-ignore
         func: it.tableName
       };
       const dataString = JSON.stringify(queryData);
       encodedData = textEncoder.encode(dataString);
+      WebSocketManager.getInstance()?.registerMessageListener(TypeConstants.DISASSEMBLY_TYPE, this.callback, () => { }, true);
       WebSocketManager.getInstance()?.sendMessage(TypeConstants.DISASSEMBLY_TYPE, Constants.DISASSEMBLY_QUERY_ELF_CMD, encodedData);
+      if (WebSocketManager.disaStatus !== 'ready') {
+        // @ts-ignore
+        this.perfAnalysisHeadTips?.innerHTML = 'Request timed out.Install the extended service according to the help document.';
+        return;
+      }
     }
-    WebSocketManager.getInstance()?.registerMessageListener(TypeConstants.DISASSEMBLY_TYPE,this.callback,() => {},true);
     setTimeout(() => {
-      if(this.perfAnalysisHeadTips?.innerHTML === ''){
+      if (this.perfAnalysisHeadTips?.innerHTML === '') {
         // @ts-ignore
         WebSocketManager.getInstance()?.sendMessage(TypeConstants.DISASSEMBLY_TYPE, Constants.DISASSEMBLY_QUERY_CMD, encodedData);
         this.functionListener!(it, this.clickFuncVaddrList);
diff --git a/ide/src/webSocket/WebSocketManager.ts b/ide/src/webSocket/WebSocketManager.ts
index 0d11236f2..fc9897fae 100644
--- a/ide/src/webSocket/WebSocketManager.ts
+++ b/ide/src/webSocket/WebSocketManager.ts
@@ -42,6 +42,7 @@ export class WebSocketManager {
     private cacheInfo: Map<number, unknown> = new Map<number, unknown>();
     private reconnect: number = -1;
     private connectStatus: HTMLElement | null | undefined;
+    static disaStatus: string = GetStatuses.UNCONNECTED;
 
     constructor() {
         if (WebSocketManager.instance) {
@@ -58,7 +59,7 @@ export class WebSocketManager {
         this.websocket = new WebSocket(this.url);
         this.websocket.binaryType = 'arraybuffer';
         // @ts-ignore
-        setInterval(this.checkConnectionStatus(this.websocke), 5000);
+        setInterval(this.checkConnectionStatus(this.websocket), 5000);
         this.websocket.onopen = (): void => {
             this.status = GetStatuses.CONNECTED;
             // 设置心跳定时器
@@ -82,8 +83,8 @@ export class WebSocketManager {
         };
 
         this.websocket.onclose = (event): void => {
-            this.checkConnectionStatus(this.websocket);
             this.status = GetStatuses.UNCONNECTED;
+            this.checkConnectionStatus(this.websocket);
             this.finalStatus();
             //初始化标志位
             this.initLoginInfo();
@@ -142,7 +143,7 @@ export class WebSocketManager {
     updateMessage(decode: MessageParam): void {
         if (decode.cmd === Constants.GET_VERSION_CMD) {
             // 小于则升级
-            let targetVersion = '1.1.1';
+            let targetVersion = '1.1.2';
             let currentVersion = new TextDecoder().decode(decode.data);
             let result = this.compareVersion(currentVersion, targetVersion);
             if (result === -1) {
@@ -281,6 +282,7 @@ registerMessageListener(type: number, callback: Function, eventCallBack: Functio
         } else {
             this.send(type, cmd, data);
         }
+        WebSocketManager.disaStatus = this.status;
     }
 
     send(type: number, cmd?: number, data?: Uint8Array): void {
@@ -300,6 +302,9 @@ registerMessageListener(type: number, callback: Function, eventCallBack: Functio
     sendHeartbeat(): void {
         this.heartbeatInterval = window.setInterval(() => {
             if (this.status === GetStatuses.READY) {
+                WebSocketManager.disaStatus = GetStatuses.READY;
+                // @ts-ignore
+                this.connectStatus?.style.backgroundColor = 'green';
                 this.send(TypeConstants.HEARTBEAT_TYPE, undefined, undefined);
             }
         }, Constants.INTERVAL_TIME);
@@ -355,12 +360,14 @@ registerMessageListener(type: number, callback: Function, eventCallBack: Functio
     finalStatus(): void {
         if (this.reconnect !== -1) {
             if (this.status === GetStatuses.READY) {
+                WebSocketManager.disaStatus = GetStatuses.READY;
                 // @ts-ignore
                 this.connectStatus?.style.backgroundColor = 'green';
                 // @ts-ignore
                 this.sendMessage(this.reconnect, this.cacheInfo.get(this.reconnect)!.cmd, this.cacheInfo.get(this.reconnect)!.data);
                 return;
             }
+            WebSocketManager.disaStatus = GetStatuses.UNCONNECTED;
             // @ts-ignore
             this.connectStatus?.style.backgroundColor = 'red';
             this.distributeMap.get(this.reconnect)!.eventCallBack(this.status);
-- 
Gitee


From fa964e5e24ce2ec3bb47e96f29e10acc08e1fb55 Mon Sep 17 00:00:00 2001
From: zhangzhuozhou <zhangzhuozhou@huawei.com>
Date: Mon, 7 Apr 2025 16:49:35 +0800
Subject: [PATCH 05/13] =?UTF-8?q?feat:=E9=80=82=E9=85=8Draw=20trace=20?=
 =?UTF-8?q?=E5=86=85=E6=A0=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangzhuozhou <zhangzhuozhou@huawei.com>
---
 .../ftrace_event_processor.cpp                | 23 ++++++++++++++++---
 .../rawtrace_parser/ftrace_event_processor.h  |  1 +
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/trace_streamer/src/parser/rawtrace_parser/ftrace_event_processor.cpp b/trace_streamer/src/parser/rawtrace_parser/ftrace_event_processor.cpp
index acfa18997..d6ffa3c2b 100644
--- a/trace_streamer/src/parser/rawtrace_parser/ftrace_event_processor.cpp
+++ b/trace_streamer/src/parser/rawtrace_parser/ftrace_event_processor.cpp
@@ -249,11 +249,24 @@ bool FtraceEventProcessor::SchedSwitch(FtraceEvent &ftraceEvent, uint8_t data[],
     auto schedSwitchMsg = ftraceEvent.mutable_sched_switch_format();
     schedSwitchMsg->set_prev_comm(FtraceFieldProcessor::HandleStrField(format.fields, index++, data, size));
     schedSwitchMsg->set_prev_pid(FtraceFieldProcessor::HandleIntField<int32_t>(format.fields, index++, data, size));
-    schedSwitchMsg->set_prev_prio(FtraceFieldProcessor::HandleIntField<int32_t>(format.fields, index++, data, size));
+    // Optimizing the trace data structure for the HM kernel compatibility.
+    if (format.fields[index].size == NEW_SCHED_PRIO_SIZE) {
+        schedSwitchMsg->set_prev_prio(
+            FtraceFieldProcessor::HandleIntField<int16_t>(format.fields, index++, data, size));
+    } else {
+        schedSwitchMsg->set_prev_prio(
+            FtraceFieldProcessor::HandleIntField<int32_t>(format.fields, index++, data, size));
+    }
     schedSwitchMsg->set_prev_state(FtraceFieldProcessor::HandleIntField<uint64_t>(format.fields, index++, data, size));
     schedSwitchMsg->set_next_comm(FtraceFieldProcessor::HandleStrField(format.fields, index++, data, size));
     schedSwitchMsg->set_next_pid(FtraceFieldProcessor::HandleIntField<int32_t>(format.fields, index++, data, size));
-    schedSwitchMsg->set_next_prio(FtraceFieldProcessor::HandleIntField<int32_t>(format.fields, index++, data, size));
+    if (format.fields[index].size == NEW_SCHED_PRIO_SIZE) {
+        schedSwitchMsg->set_next_prio(
+            FtraceFieldProcessor::HandleIntField<int16_t>(format.fields, index++, data, size));
+    } else {
+        schedSwitchMsg->set_next_prio(
+            FtraceFieldProcessor::HandleIntField<int32_t>(format.fields, index++, data, size));
+    }
     return true;
 }
 bool FtraceEventProcessor::SchedBlockedReason(FtraceEvent &ftraceEvent,
@@ -284,7 +297,11 @@ bool FtraceEventProcessor::SchedWakeup(FtraceEvent &ftraceEvent, uint8_t data[],
     auto schedWakeupMsg = ftraceEvent.mutable_sched_wakeup_format();
     schedWakeupMsg->set_comm(FtraceFieldProcessor::HandleStrField(format.fields, index++, data, size));
     schedWakeupMsg->set_pid(FtraceFieldProcessor::HandleIntField<int32_t>(format.fields, index++, data, size));
-    schedWakeupMsg->set_prio(FtraceFieldProcessor::HandleIntField<int32_t>(format.fields, index++, data, size));
+    if (format.fields[index].size == NEW_SCHED_PRIO_SIZE) {
+        schedWakeupMsg->set_prio(FtraceFieldProcessor::HandleIntField<int16_t>(format.fields, index++, data, size));
+    } else {
+        schedWakeupMsg->set_prio(FtraceFieldProcessor::HandleIntField<int32_t>(format.fields, index++, data, size));
+    }
     schedWakeupMsg->set_success(FtraceFieldProcessor::HandleIntField<int32_t>(format.fields, index++, data, size));
     schedWakeupMsg->set_target_cpu(FtraceFieldProcessor::HandleIntField<int32_t>(format.fields, index++, data, size));
     return true;
diff --git a/trace_streamer/src/parser/rawtrace_parser/ftrace_event_processor.h b/trace_streamer/src/parser/rawtrace_parser/ftrace_event_processor.h
index 3fe404dc0..453f061c6 100644
--- a/trace_streamer/src/parser/rawtrace_parser/ftrace_event_processor.h
+++ b/trace_streamer/src/parser/rawtrace_parser/ftrace_event_processor.h
@@ -96,6 +96,7 @@ private:
     std::map<std::string, HandleFunction> eventNameToFunctions_;
     TraceStreamerConfig config_;
     const uint32_t SCHED_BLOCKED_REASON_FIELD_SIZE_EIGHT = 8;
+    const uint32_t NEW_SCHED_PRIO_SIZE = 2;
 };
 } // namespace TraceStreamer
 } // namespace SysTuning
-- 
Gitee


From 5e1b79807a8f454e3127f33ef61446bf87a020fa Mon Sep 17 00:00:00 2001
From: danghongquan <danghongquan3@huawei.com>
Date: Mon, 7 Apr 2025 17:04:55 +0800
Subject: [PATCH 06/13] =?UTF-8?q?fix:=E7=89=88=E6=9C=AC=E5=8F=B7=E5=92=8C?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E6=9C=8D=E5=8A=A1=E4=BF=9D=E6=8C=81=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: danghongquan <danghongquan3@huawei.com>
---
 ide/src/webSocket/WebSocketManager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ide/src/webSocket/WebSocketManager.ts b/ide/src/webSocket/WebSocketManager.ts
index fc9897fae..5285aec4c 100644
--- a/ide/src/webSocket/WebSocketManager.ts
+++ b/ide/src/webSocket/WebSocketManager.ts
@@ -143,7 +143,7 @@ export class WebSocketManager {
     updateMessage(decode: MessageParam): void {
         if (decode.cmd === Constants.GET_VERSION_CMD) {
             // 小于则升级
-            let targetVersion = '1.1.2';
+            let targetVersion = '1.1.1';
             let currentVersion = new TextDecoder().decode(decode.data);
             let result = this.compareVersion(currentVersion, targetVersion);
             if (result === -1) {
-- 
Gitee


From f15a0d4b3480775eaef2553623cfdc7729041fbd Mon Sep 17 00:00:00 2001
From: wenxingqi <wenxingqi1@h-partners.com>
Date: Tue, 8 Apr 2025 10:15:23 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9ffrt=5Fconvert.cpp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wenxingqi <wenxingqi1@h-partners.com>
---
 trace_streamer/src/rpc/ffrt_converter.cpp | 163 +++++++++++++++-------
 1 file changed, 114 insertions(+), 49 deletions(-)

diff --git a/trace_streamer/src/rpc/ffrt_converter.cpp b/trace_streamer/src/rpc/ffrt_converter.cpp
index 918560868..72b5f3e05 100644
--- a/trace_streamer/src/rpc/ffrt_converter.cpp
+++ b/trace_streamer/src/rpc/ffrt_converter.cpp
@@ -318,27 +318,41 @@ bool IsOldVersionTrace(ConStr &log)
     if (fPos == std::string::npos) {
         return false;
     }
-    size_t hCoPos = log.find(hCo, fPos + fPattern.size());
-    if (hCoPos != std::string::npos && hCoPos > fPos + fPattern.size()) {
-        bool valid = true;
-        std::string numStr = log.substr(fPos + fPattern.size(), hCoPos - fPos - fPattern.size());
-        int num = 0;
-        auto [ptr, ec] = std::from_chars(numStr.data(), numStr.data() + numStr.size(), num);
-        if (ec != std::errc{}) {
-            valid = false;
-        }
-        if (!valid) {
-            return false;
-        }
-        size_t afterCo = hCoPos + hCo.size();
-        while (afterCo < log.length() && isspace(log[afterCo])) {
-            ++afterCo;
-        }
-        if (afterCo < log.length() && isdigit(log[afterCo])) {
-            return true;
-        }
+
+    size_t num1Start = fPos + fPattern.size();
+    if (num1Start >= log.length() || !std::isdigit(log[num1Start])) {
+        return false;
     }
-    return false;
+    size_t num1End = num1Start;
+    while (num1End < log.length() && std::isdigit(log[num1End])) {
+        num1End++;
+    }
+    if (num1End == num1Start) {
+        return false;
+    }
+
+    size_t hCoPos = log.find(hCo, num1End);
+    if (hCoPos == std::string::npos) {
+        return false;
+    }
+
+    size_t afterHCo = hCoPos + hCo.size();
+    if (afterHCo >= log.length() || (log[afterHCo] != '|' && !std::isspace(log[afterHCo]))) {
+        return false;
+    }
+
+    size_t num2Start = afterHCo + 1;
+    if (num2Start >= log.length() || !std::isdigit(log[num2Start])) {
+        return false;
+    }
+    size_t num2End = num2Start;
+    while (num2End < log.length() && std::isdigit(log[num2End])) {
+        num2End++;
+    }
+    if (num2End == num2Start) {
+        return false;
+    }
+    return true;
 }
 
 void FfrtConverter::ClassifyLogsForFfrtWorker(FfrtPids& ffrtPids, FfrtWakeLogs& ffrtWakeLogs)
@@ -512,14 +526,14 @@ static size_t FindPatternStart(ConStr &log)
     return std::string::npos;
 }
 
-static size_t FindPatternEnd(ConStr &log)
+static std::pair<size_t, size_t> FindPatternEnd(ConStr &log)
 {
     size_t pos = 0;
     static std::string hr = "H:R";
     while (pos < log.size()) {
         pos = log.find(" F|", pos);
         if (pos == std::string::npos) {
-            return std::string::npos;
+            return {std::string::npos, std::string::npos};
         }
 
         size_t numStart = pos + 3;
@@ -558,12 +572,16 @@ static size_t FindPatternEnd(ConStr &log)
             }
 
             if (finalNum < log.length() && isdigit(log[finalNum])) {
-                return pos;
+                size_t endPos = finalNum;
+                while (endPos < log.length() && std::isdigit(log[endPos])) {
+                    endPos++;
+                }
+                return {pos, endPos - 1};
             }
         }
         pos = rPos;
     }
-    return std::string::npos;
+    return {std::string::npos, std::string::npos};
 }
 
 static void ParseOtherTraceLogs(LogInfo logInfo, WakeLogs &traceMap, FfrtWakeLogs &ffrtWakeLogs)
@@ -577,8 +595,10 @@ static void ParseOtherTraceLogs(LogInfo logInfo, WakeLogs &traceMap, FfrtWakeLog
         }
         traceMap[logInfo.tid].emplace_back(logInfo.lineno);
 
-        if (FindPatternEnd(logInfo.log) != std::string::npos) {
-            std::string hStr = logInfo.log.substr(logInfo.log.find_last_of('|') + 1);
+        auto posPair = FindPatternEnd(logInfo.log);
+        if (posPair.first != std::string::npos) {
+            std::string logSub = logInfo.log.substr(posPair.first, posPair.second - posPair.first + 1);
+            std::string hStr = logSub.substr(logSub.find_last_of('|') + 1);
             if (hStr[0] == 'H') {
                 hStr = hStr.substr(hStr.find_last_of(' ') + 1);
             }
@@ -876,14 +896,20 @@ static void HandleQueTaskInfoOut(ConStr &log, int lineno, int pid, QueueTaskInfo
     std::string pidStr = log.substr(fPos + fStr.size(), hPos - (fPos + fStr.size()));
     if (!pidStr.empty() && std::all_of(pidStr.begin(), pidStr.end(), ::isdigit)) {
         int spacePos = hPos + fStr.size() + 1;
-        while (log[spacePos] == ' ') {
-            spacePos++;
+        if (log[spacePos] != ' ' && log[spacePos] != '|') {
+            return;
         }
+        spacePos++;
         bool spaceFlage = spacePos != std::string::npos && spacePos < log.length();
         if (!spaceFlage) {
             return;
         }
-        std::string gidStr = log.substr(spacePos);
+        std::string gidStr = "";
+        if (log[spacePos - 1] == ' ') {
+            gidStr = log.substr(spacePos);
+        } else {
+            gidStr = log.substr(spacePos, log.substr(spacePos).find('|'));
+        }
         if (!gidStr.empty() && std::all_of(gidStr.begin(), gidStr.end(), ::isdigit)) {
             int gid = std::stoull(gidStr);
             if (queueTaskInfo[pid].find(gid) != queueTaskInfo[pid].end()) {
@@ -963,8 +989,14 @@ void FfrtConverter::ExceTaskGroups(std::vector<tidInfo> &group, WakeLogs &wakeLo
             int gid = group[i].gid;
             wakeLogs[firstGid].insert(wakeLogs[firstGid].end(), wakeLogs[gid].begin(), wakeLogs[gid].end());
             for (auto& lineno : group[i].begin) {
-                size_t strLen = context_[lineno].find_last_of("|") + 1;
-                context_[lineno] = context_[lineno].substr(0, strLen) + std::to_string(firstGid) + "\n";
+                size_t rightIndex = context_[lineno].find_last_of("|");
+                if (context_[lineno][rightIndex + 1] == 'I') {
+                    context_[lineno]
+                        = context_[lineno].substr(0, context_[lineno].substr(0, rightIndex).find_last_of("|") + 1)
+                        + std::to_string(firstGid) + context_[lineno].substr(rightIndex) + "\n";
+                } else {
+                    context_[lineno] = context_[lineno].substr(0, rightIndex + 1) + std::to_string(firstGid) + "\n";
+                }
             }
         }
     }
@@ -1049,29 +1081,55 @@ bool FfrtConverter::HandleFfrtTaskCo(ConStr &log, int lineno, bool &switchInFake
     return false;
 }
 
-static bool IsFfrtTaskBlockOrFinish(ConStr &log)
+bool IsFfrtTaskBlockOrFinish(ConStr &log)
 {
-    static const std::string fStr = " F|";
-    int fPos = log.find(fStr);
+    static const std::string fStr = "F|";
+    size_t fPos = log.find(fStr);
     if (fPos == std::string::npos) {
         return false;
     }
-    size_t hPos = log.find("|H:", fPos);
-    if (hPos != std::string::npos) {
-        size_t typePos = hPos + fStr.size();
-        if (typePos < log.length() &&
-        (log[typePos] == 'F' || log[typePos] == 'B')) {
-            int spacePos = typePos + 1;
-            while (spacePos < log.length() && isspace(log[spacePos])) {
-                ++spacePos;
-            }
 
-            if (spacePos < log.length() && isdigit(log[spacePos])) {
-                return true;
-            }
-        }
+    size_t num1Start = fPos + fStr.size();
+    if (num1Start >= log.length() || !std::isdigit(log[num1Start])) {
+        return false;
     }
-    return false;
+    size_t num1End = num1Start;
+    while (num1End < log.length() && std::isdigit(log[num1End])) {
+        num1End++;
+    }
+    if (num1End == num1Start) {
+        return false;
+    }
+
+    size_t hPos = log.find("|H:", num1End);
+    if (hPos == std::string::npos) {
+        return false;
+    }
+
+    size_t typePos = hPos + 3;
+    if (typePos >= log.length() || (log[typePos] != 'B' && log[typePos] != 'F')) {
+        return false;
+    }
+
+    size_t afterType = typePos + 1;
+    if (afterType >= log.length() || (log[afterType] != '|' && !std::isspace(log[afterType]))) {
+        return false;
+    }
+
+    size_t num2Start = afterType + 1;
+    if (num2Start >= log.length() || !std::isdigit(log[num2Start])) {
+        return false;
+    }
+    size_t num2End = num2Start;
+    while (num2End < log.length() && std::isdigit(log[num2End])) {
+        num2End++;
+    }
+
+    if (num2End == num2Start) {
+        return false;
+    }
+
+    return true;
 }
 
 bool FfrtConverter::HandleFfrtTaskExecute(FakeLogArgs &fakLogArg, WakeLogs &wakeLogs,
@@ -1096,7 +1154,14 @@ bool FfrtConverter::HandleFfrtTaskExecute(FakeLogArgs &fakLogArg, WakeLogs &wake
             if (pos + 1 >= fakLogArg.log.size()) {
                 return true;
             }
-            std::string gidStr = fakLogArg.log.substr(pos + 1);
+            std::string gidStr = "";
+            if (fakLogArg.log[pos + 1] == 'I') {
+                size_t rightIndex = fakLogArg.log.find_last_of("|");
+                size_t leftIndex = fakLogArg.log.substr(0, rightIndex).find_last_of("|") + 1;
+                gidStr = fakLogArg.log.substr(leftIndex, rightIndex - leftIndex);
+            } else {
+                gidStr = fakLogArg.log.substr(pos + 1);
+            }
             auto [ptr, ec] = std::from_chars(gidStr.data(), gidStr.data() + gidStr.size(), gid);
             if (ec != std::errc{}) {
                 return true;
-- 
Gitee


From 2b9156e4de3858726802300c3d67d963a80725a9 Mon Sep 17 00:00:00 2001
From: wangziyi <wangziyi40@huawei.com>
Date: Wed, 9 Apr 2025 09:53:41 +0800
Subject: [PATCH 08/13] =?UTF-8?q?fix:=E7=BA=A6=E6=9D=9F=E4=B8=8E=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangziyi <wangziyi40@huawei.com>
---
 ide/src/doc/quickstart_limit.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ide/src/doc/quickstart_limit.html b/ide/src/doc/quickstart_limit.html
index 6757248d7..7582da8ee 100644
--- a/ide/src/doc/quickstart_limit.html
+++ b/ide/src/doc/quickstart_limit.html
@@ -800,6 +800,11 @@ linux内核6.6.30版本后抓取的htrace不支持解析；
             <li>
                 <pre class="smartperf-text fontColor light">
 只支持抓取全进程，不支持抓取开机启动的trace。
+</pre>
+            </li>
+            <li>
+                <pre class="smartperf-text fontColor light">
+大小尽量控制在800M以内。
 </pre>
             </li>
         </ul>
@@ -808,6 +813,11 @@ linux内核6.6.30版本后抓取的htrace不支持解析；
             <li>
                 <pre class="smartperf-text fontColor light">
 不支持抓取全进程，最多可以选择抓取四个进程。
+</pre>
+            </li>
+            <li>
+                <pre class="smartperf-text fontColor light">
+从OpenHarmony SDK 5.0.0.40 开始，user版本仅支持对debug应用进行调试。
 </pre>
             </li>
         </ul>
-- 
Gitee


From 647cdce45988605d58884da22f43a8a70286edb3 Mon Sep 17 00:00:00 2001
From: wangziyi <wangziyi40@huawei.com>
Date: Thu, 10 Apr 2025 19:50:47 +0800
Subject: [PATCH 09/13] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E8=B7=9F=E9=9A=8F=E6=94=B6=E8=97=8F=E6=B3=B3=E9=81=93=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangziyi <wangziyi40@huawei.com>
---
 ide/src/trace/component/trace/SpChartList.ts  | 24 ++++++++++++++++++-
 .../trace/component/trace/base/TraceRow.ts    |  5 +++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/ide/src/trace/component/trace/SpChartList.ts b/ide/src/trace/component/trace/SpChartList.ts
index 4dcd9bd97..8e2956aad 100644
--- a/ide/src/trace/component/trace/SpChartList.ts
+++ b/ide/src/trace/component/trace/SpChartList.ts
@@ -117,7 +117,7 @@ export class SpChartList extends BaseElement {
         this.collectRowList1.forEach((row) => this.fragmentGroup1.appendChild(row));
         this.scrollTop = 0;
       }
-      offsetYTimeOut = setTimeout(() => { 
+      offsetYTimeOut = setTimeout(() => {
         this.handleCollectFunc();
         this.spSystemTrace?.refreshCanvas(true);
       }, 50);
@@ -371,6 +371,7 @@ export class SpChartList extends BaseElement {
     vessel.addEventListener('mousedown', this.onMouseDown);
     vessel.addEventListener('mouseup', this.onMouseUp);
     vessel.addEventListener('mousemove', this.onMouseMove);
+    vessel.addEventListener('mouseenter', this.onMouseEnter);
     this.addEventListener('scroll', this.onScroll, { passive: true });
   }
 
@@ -380,6 +381,7 @@ export class SpChartList extends BaseElement {
     vessel.removeEventListener('mousedown', this.onMouseDown);
     vessel.removeEventListener('mouseup', this.onMouseUp);
     vessel.removeEventListener('mousemove', this.onMouseMove);
+    vessel.removeEventListener('mouseenter', this.onMouseEnter);
     this.removeEventListener('scroll', this.onScroll);
   }
 
@@ -396,6 +398,22 @@ export class SpChartList extends BaseElement {
     window.publish(window.SmartEvent.UI.RefreshCanvas, {});
   };
 
+  onMouseEnter = (ev: MouseEvent): void => {
+    if (this.canResize && this.isPress) {
+      // @ts-ignore
+      if (ev?.buttons === 0) { // 0表示鼠标没有按键动作，说明此时鼠标已经松开，使收藏显示区域拖拽伸缩功能不可用
+        this.isPress = false;
+        this.canResize = false;
+        this.style.cursor = 'default';
+        // @ts-ignore
+        (window as unknown).collectResize = false;
+        if (this.style.display === 'flex') {
+          this.refreshFavoriteCanvas();
+        }
+      }
+    }
+  };
+
   onMouseDown = (ev: MouseEvent): void => {
     this.isPress = true;
     this.startPageY = ev.pageY;
@@ -432,6 +450,10 @@ export class SpChartList extends BaseElement {
       return;
     }
     if (this.canResize && this.isPress) {
+      //@ts-ignore
+      if (!(window as unknown).collectResize) {
+        return;
+      }
       // @ts-ignore
       (window as unknown).collectResize = true;
       // 拖动超过所有泳道最大高度 或小于一个泳道的高度，不支持拖动
diff --git a/ide/src/trace/component/trace/base/TraceRow.ts b/ide/src/trace/component/trace/base/TraceRow.ts
index a13db4ae9..7bda9c89d 100644
--- a/ide/src/trace/component/trace/base/TraceRow.ts
+++ b/ide/src/trace/component/trace/base/TraceRow.ts
@@ -1034,7 +1034,8 @@ export class TraceRow<T extends BaseStruct> extends HTMLElement {
     this._rowSettingCheckBoxList && this._rowSettingCheckBoxList.forEach((item) => {
       checkboxHtml += `<div class="checkboxItem" style="margin-bottom: 2px;">
       <lit-check-box class="lit-checkbox" checked style="margin-left: 20px;" not-close value="${item}"></lit-check-box>
-      </div>`; });
+      </div>`;
+    });
     this._rowSettingCheckedBoxList = new Array(this._rowSettingCheckBoxList?.length).fill(true);
     this.rowSettingCheckBoxPop.innerHTML = `<div slot="content" id="settingList"
       style="display: block;height: auto;max-height:200px;overflow-y:auto">
@@ -1260,6 +1261,8 @@ export class TraceRow<T extends BaseStruct> extends HTMLElement {
     this.describeEl!.ondragleave = (ev: unknown): void => {
       // @ts-ignore
       this.drawLine(ev.currentTarget, '');
+      // @ts-ignore
+      (window as unknown).collectResize = false;
       return undefined;
     };
     this.describeElEvent();
-- 
Gitee


From 0938eb7950af1e05c2c4fd9e63878371668a11ca Mon Sep 17 00:00:00 2001
From: wangziyi <wangziyi40@huawei.com>
Date: Thu, 10 Apr 2025 19:53:57 +0800
Subject: [PATCH 10/13] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=90=8Ecpu=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA=E9=87=8D?=
 =?UTF-8?q?=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangziyi <wangziyi40@huawei.com>
---
 ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts b/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts
index 9419ba8e5..01730f73f 100644
--- a/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts
+++ b/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts
@@ -273,6 +273,7 @@ export class CpuStruct extends BaseStruct {
         ctx.globalAlpha = 1;
         ctx.fillStyle = '#e0e0e0';
       }
+      ctx.clearRect(data.frame.x, data.frame.y, width, data.frame.height);
       ctx.fillRect(data.frame.x, data.frame.y, width, data.frame.height);
       ctx.globalAlpha = 1;
       CpuStruct.drawText(ctx, data, width, pid, tid);
-- 
Gitee


From ebcd6cecc4755ecfed608a9cb579c4c9c94bfff1 Mon Sep 17 00:00:00 2001
From: danghongquan <danghongquan3@huawei.com>
Date: Fri, 11 Apr 2025 09:38:06 +0800
Subject: [PATCH 11/13] =?UTF-8?q?fix:=E7=82=B9=E5=87=BBfunction=E6=97=A0?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: danghongquan <danghongquan3@huawei.com>
---
 ide/src/trace/component/trace/sheet/process/TabPaneSlices.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ide/src/trace/component/trace/sheet/process/TabPaneSlices.ts b/ide/src/trace/component/trace/sheet/process/TabPaneSlices.ts
index 4b6021904..53224290b 100644
--- a/ide/src/trace/component/trace/sheet/process/TabPaneSlices.ts
+++ b/ide/src/trace/component/trace/sheet/process/TabPaneSlices.ts
@@ -87,8 +87,6 @@ export class TabPaneSlices extends BaseElement {
     this.slicesTbl!.addEventListener('row-click', (evt) => {
       // @ts-ignore
       data = evt.detail.data;
-    });
-    this.slicesTbl!.addEventListener('click', () => {
       if (!this.isDbClick) {
         this.isDbClick = true;
         FuncStruct.funcSelect = false;
-- 
Gitee


From 921e7e4129d9c312d684960f5f8a498b8b293b76 Mon Sep 17 00:00:00 2001
From: wangziyi <wangziyi40@huawei.com>
Date: Fri, 11 Apr 2025 10:29:15 +0800
Subject: [PATCH 12/13] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E5=90=8E=E6=9F=A5=E8=AF=A2=E7=BB=98=E5=88=B6=E9=94=99=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangziyi <wangziyi40@huawei.com>
---
 ide/src/trace/component/SpSystemTrace.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts
index 132194218..c771f929b 100644
--- a/ide/src/trace/component/SpSystemTrace.ts
+++ b/ide/src/trace/component/SpSystemTrace.ts
@@ -2153,7 +2153,7 @@ export class SpSystemTrace extends BaseElement {
         rootRow.expandFunc(rootRow, this);
       }
       setTimeout(() => {
-        rootRow!.scrollIntoView({ behavior: 'smooth', block: 'center' });
+        rootRow!.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
       }, 500);
     }
   }
-- 
Gitee


From a107bc032e44fa204c446f72930b033329340805 Mon Sep 17 00:00:00 2001
From: danghongquan <danghongquan3@huawei.com>
Date: Fri, 11 Apr 2025 13:55:51 +0800
Subject: [PATCH 13/13] =?UTF-8?q?fix:=E6=89=A9=E5=B1=95=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: danghongquan <danghongquan3@huawei.com>
---
 ide/src/webSocket/WebSocketManager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ide/src/webSocket/WebSocketManager.ts b/ide/src/webSocket/WebSocketManager.ts
index 5285aec4c..fc9897fae 100644
--- a/ide/src/webSocket/WebSocketManager.ts
+++ b/ide/src/webSocket/WebSocketManager.ts
@@ -143,7 +143,7 @@ export class WebSocketManager {
     updateMessage(decode: MessageParam): void {
         if (decode.cmd === Constants.GET_VERSION_CMD) {
             // 小于则升级
-            let targetVersion = '1.1.1';
+            let targetVersion = '1.1.2';
             let currentVersion = new TextDecoder().decode(decode.data);
             let result = this.compareVersion(currentVersion, targetVersion);
             if (result === -1) {
-- 
Gitee