From 1362af85c242c9067984db3460c3af566996754e Mon Sep 17 00:00:00 2001 From: jichuan Date: Wed, 14 Jun 2023 10:52:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Fix:=E8=A7=A3=E5=86=B3Hiperf=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E8=A1=8C=EF=BC=8C-p=E5=8F=82=E6=95=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jichuan --- ide/src/trace/component/SpRecordTrace.ts | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ide/src/trace/component/SpRecordTrace.ts b/ide/src/trace/component/SpRecordTrace.ts index bc1e9cdfe..b98a010c2 100644 --- a/ide/src/trace/component/SpRecordTrace.ts +++ b/ide/src/trace/component/SpRecordTrace.ts @@ -1576,10 +1576,19 @@ export class SpRecordTrace extends BaseElement { recordArgs = recordArgs + '-f ' + perfConfig?.frequency; if (perfConfig?.process && !perfConfig?.process.includes('ALL') && perfConfig?.process.length > 0) { let process = perfConfig.process; - if (this.isNumber(process)) { - recordArgs = recordArgs + ' -p ' + perfConfig?.process; + if (process.indexOf(',') != -1) { + let processIdOrName = process.split(','); + if (this.isNumber(processIdOrName[0])) { + recordArgs = recordArgs + ' -p ' + perfConfig?.process; + } else { + recordArgs = recordArgs + ' --app ' + perfConfig?.process; + } } else { - recordArgs = recordArgs + ' --app ' + perfConfig?.process; + if (this.isNumber(process)) { + recordArgs = recordArgs + ' -p ' + perfConfig?.process; + } else { + recordArgs = recordArgs + ' --app ' + perfConfig?.process; + } } } else { recordArgs = recordArgs + ' -a '; -- Gitee From 5be21c74f61d6aa1c7d5c75cd4bcaec800d4f408 Mon Sep 17 00:00:00 2001 From: jichuan Date: Fri, 16 Jun 2023 10:25:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=B5=81=E6=B0=B4=E7=BA=BF=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jichuan --- trace_streamer/gn/toolchain/BUILD.gn | 6 +++--- trace_streamer/pare_third_party.sh | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/trace_streamer/gn/toolchain/BUILD.gn b/trace_streamer/gn/toolchain/BUILD.gn index 3b3150946..37f5bc3d0 100755 --- a/trace_streamer/gn/toolchain/BUILD.gn +++ b/trace_streamer/gn/toolchain/BUILD.gn @@ -14,12 +14,12 @@ import("//gn/wasm.gni") declare_args() { if (target_os == "linux" || target_os == "macx") { - cc = "/usr/bin/clang" - cxx = "/usr/bin/clang++" + cc = "clang" + cxx = "clang++" pic = "-fPIC" rebuild_string = "" extra_asmflags = "" - asm = "/usr/bin/clang" + asm = "clang" } else if (target_os == "windows") { cc = "gcc.exe" cxx = "g++.exe" diff --git a/trace_streamer/pare_third_party.sh b/trace_streamer/pare_third_party.sh index a3a54f63d..0639f4a53 100755 --- a/trace_streamer/pare_third_party.sh +++ b/trace_streamer/pare_third_party.sh @@ -26,7 +26,7 @@ cd third_party if [ ! -f "sqlite/BUILD.gn" ];then rm -rf sqlite - git clone git@gitee.com:openharmony/third_party_sqlite.git + git clone https://gitee.com/openharmony/third_party_sqlite.git if [ -d "third_party_sqlite" ];then mv third_party_sqlite sqlite $cp ../prebuilts/patch_sqlite/sqlite3build.gn ../third_party/sqlite/BUILD.gn @@ -34,7 +34,7 @@ if [ ! -f "sqlite/BUILD.gn" ];then fi if [ ! -f "protobuf/BUILD.gn" ];then rm -rf protobuf - git clone git@gitee.com:openharmony/third_party_protobuf.git + git clone https://gitee.com/openharmony/third_party_protobuf.git if [ -d "third_party_protobuf" ];then mv third_party_protobuf protobuf $cp ../prebuilts/patch_protobuf/protobufbuild.gn ../third_party/protobuf/BUILD.gn @@ -43,7 +43,7 @@ fi if [ ! -f "googletest/BUILD.gn" ];then rm -rf googletest - git clone git@gitee.com:openharmony/third_party_googletest.git + git clone https://gitee.com/openharmony/third_party_googletest.git if [ -d "third_party_googletest" ];then mv third_party_googletest googletest $cp ../prebuilts/patch_googletest/googletestbuild.gn ../third_party/googletest/BUILD.gn @@ -56,7 +56,7 @@ fi if [ ! -f "json-master/BUILD.gn" ];then rm -rf json-master - git clone git@gitee.com:openharmony/third_party_json.git + git clone https://gitee.com/openharmony/third_party_json.git if [ -d "third_party_json" ];then mv third_party_json json-master fi @@ -64,7 +64,7 @@ fi if [ ! -f "libunwind/BUILD.gn" ];then rm -rf libunwind - git clone git@gitee.com:openharmony/third_party_libunwind.git + git clone https://gitee.com/openharmony/third_party_libunwind.git if [ -d "third_party_libunwind" ];then mv third_party_libunwind libunwind $cp ../prebuilts/patch_libunwind/libunwindbuild.gn libunwind/BUILD.gn @@ -88,7 +88,7 @@ fi if [ ! -f "hiperf/BUILD.gn" ];then rm -rf hiperf developtools_hiperf - git clone -b OpenHarmony-3.2-Release --depth=1 git@gitee.com:openharmony/developtools_hiperf.git + git clone -b OpenHarmony-3.2-Release --depth=1 https://gitee.com/openharmony/developtools_hiperf.git if [ -d "developtools_hiperf" ];then mv developtools_hiperf hiperf $cp ../prebuilts/patch_hiperf/BUILD.gn ../third_party/hiperf/BUILD.gn -- Gitee