From 9f8eee09ad6f7eb889ac04871cc748670adbc242 Mon Sep 17 00:00:00 2001 From: zhang-cui11 Date: Tue, 20 Sep 2022 14:28:08 +0800 Subject: [PATCH 1/2] add config Signed-off-by: zhang-cui11 --- BUILD.gn | 7 +++++++ bundle.json | 3 ++- config/hiperf.cfg | 10 ++++++++++ include/debug_logger.h | 4 ++-- include/subcommand_record.h | 6 +++--- .../innerkits/native/include/hiperf_client.h | 2 +- src/subcommand_record.cpp | 4 ++-- src/virtual_runtime.cpp | 2 +- test/unittest/common/native/hiperf_client_test.cpp | 4 ++-- .../common/native/hiperf_libreport_test.cpp | 2 +- .../common/native/include/callstack_test.h | 14 +++++++------- .../common/native/subcommand_record_test.cpp | 2 +- .../resource/testdata/report_test_callstack.txt | 2 +- .../resource/testdata/report_test_diff.txt | 2 +- .../resource/testdata/report_test_dsos.txt | 2 +- .../resource/testdata/report_test_funcs.txt | 2 +- test/unittest/resource/testdata/report_test_i.txt | 2 +- .../resource/testdata/report_test_limit.txt | 2 +- .../resource/testdata/report_test_limit1.txt | 2 +- .../resource/testdata/report_test_sort1.txt | 2 +- .../resource/testdata/report_test_sort2.txt | 2 +- .../resource/testdata/report_test_symbol.txt | 2 +- .../resource/testdata/report_test_tids.txt | 2 +- .../resource/testdata/report_test_tids1.txt | 2 +- 24 files changed, 51 insertions(+), 33 deletions(-) create mode 100644 config/hiperf.cfg diff --git a/BUILD.gn b/BUILD.gn index 6ccb95b..0ebb347 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -368,6 +368,13 @@ ohos_executable("hiperf_host") { part_name = "hiperf" } +ohos_prebuilt_etc("hiperf.cfg") { + source = "./config/hiperf.cfg" + relative_install_dir = "init" + subsystem_name = "developtools" + part_name = "hiperf" +} + ohos_source_set("hiperf_platform_host") { part_name = "hiperf" sources = [ "./src/hiperf_libreport.cpp" ] diff --git a/bundle.json b/bundle.json index 375e5eb..e99309f 100644 --- a/bundle.json +++ b/bundle.json @@ -30,7 +30,8 @@ "build": { "sub_component": [ "//developtools/hiperf:hiperf_target", - "//developtools/hiperf:hiperf_target_all" + "//developtools/hiperf:hiperf_target_all", + "//developtools/hiperf:hiperf.cfg" ], "inner_kits": [ { diff --git a/config/hiperf.cfg b/config/hiperf.cfg new file mode 100644 index 0000000..00f846c --- /dev/null +++ b/config/hiperf.cfg @@ -0,0 +1,10 @@ +{ + "jobs" : [{ + "name" : "post-init", + "cmds" : [ + "mkdir /data/log/ 0775 system log", + "mkdir /data/log/hiperf/ 0755 shell shell" + ] + } + ] +} diff --git a/include/debug_logger.h b/include/debug_logger.h index b10c355..c1f452d 100644 --- a/include/debug_logger.h +++ b/include/debug_logger.h @@ -56,8 +56,8 @@ enum DebugLevel { #ifdef HIPERF_DEBUG #if is_ohos || is_double_framework -const std::string DEFAULT_UT_LOG_DIR = "/data/local/tmp/"; -const std::string DEFAULT_LOG_PATH = "/data/local/tmp/hiperf_log.txt"; +const std::string DEFAULT_UT_LOG_DIR = "/data/log/hiperf/"; +const std::string DEFAULT_LOG_PATH = "/data/log/hiperf/hiperf_log.txt"; #elif is_mingw const std::string DEFAULT_LOG_PATH = ".\\hiperf_log.txt"; #elif is_linux diff --git a/include/subcommand_record.h b/include/subcommand_record.h index 2bb2d67..545220c 100644 --- a/include/subcommand_record.h +++ b/include/subcommand_record.h @@ -60,7 +60,7 @@ public: "Usage: hiperf record [options] [command [command-args]]\n" " Collect performance sampling information of running [command].\n" " The default options are: -c --cpu-limit 25 -d 10000.0 -e hw-cpu-cycles\n" - " -f 4000 -m 1024 -o /data/local/tmp/perf.data.\n" + " -f 4000 -m 1024 -o /data/log/hiperf/perf.data.\n" " -a\n" " Collect system-wide information.\n" " for measures all processes/threads\n" @@ -146,7 +146,7 @@ public: " --data-limit \n" " Stop recording after SIZE bytes of records. Default is unlimited.\n" " -o \n" - " Set output file name, default is /data/local/tmp/perf.data.\n" + " Set output file name, default is /data/log/hiperf/perf.data.\n" " -z\n" " Compress record data.\n" " --verbose\n" @@ -188,7 +188,7 @@ private: int cpuPercent_ = DEFAULT_CPU_PERCENT; int mmapPages_ = MAX_PERF_MMAP_PAGE; std::vector symbolDir_ = {}; - std::string outputFilename_ = "/data/local/tmp/perf.data"; + std::string outputFilename_ = "/data/log/hiperf/perf.data"; std::string appPackage_ = {}; int checkAppMs_ = DEFAULT_CHECK_APP_MS; std::string clockId_ = {}; diff --git a/interfaces/innerkits/native/include/hiperf_client.h b/interfaces/innerkits/native/include/hiperf_client.h index 52158a9..ca6e7c7 100644 --- a/interfaces/innerkits/native/include/hiperf_client.h +++ b/interfaces/innerkits/native/include/hiperf_client.h @@ -25,7 +25,7 @@ namespace HiPerf { namespace HiperfClient { static const std::string HiperfCommandName = "hiperf"; static const std::string SystemBinPath = "/system/bin/"; -static const std::string TempBinPath = "/data/local/tmp/"; +static const std::string TempBinPath = "/data/log/hiperf/"; static const std::string CurrentPath = "./"; static const std::string PerfDataName = "perf.data"; diff --git a/src/subcommand_record.cpp b/src/subcommand_record.cpp index 71792ee..7f74b93 100644 --- a/src/subcommand_record.cpp +++ b/src/subcommand_record.cpp @@ -44,8 +44,8 @@ const std::string CONTROL_CMD_START = "start"; const std::string CONTROL_CMD_PAUSE = "pause"; const std::string CONTROL_CMD_RESUME = "resume"; const std::string CONTROL_CMD_STOP = "stop"; -const std::string CONTROL_FIFO_FILE_C2S = "/data/local/tmp/.hiperf_record_control_c2s"; -const std::string CONTROL_FIFO_FILE_S2C = "/data/local/tmp/.hiperf_record_control_s2c"; +const std::string CONTROL_FIFO_FILE_C2S = "/data/log/hiperf/.hiperf_record_control_c2s"; +const std::string CONTROL_FIFO_FILE_S2C = "/data/log/hiperf/.hiperf_record_control_s2c"; // when there are many events, start record will take more time. const std::chrono::milliseconds CONTROL_WAITREPY_TOMEOUT = 2000ms; diff --git a/src/virtual_runtime.cpp b/src/virtual_runtime.cpp index 2237513..62c0d93 100644 --- a/src/virtual_runtime.cpp +++ b/src/virtual_runtime.cpp @@ -686,7 +686,7 @@ void VirtualRuntime::LoadVdso() std::string memory(map.end_ - map.begin_, '\0'); std::copy(reinterpret_cast((map.begin_)), reinterpret_cast((map.end_)), &memory[0]); - std::string tempPath("/data/local/tmp/"); + std::string tempPath("/data/log/hiperf/"); std::string tempFileName = tempPath + MMAP_VDSO_NAME; if (!WriteStringToFile(tempFileName, memory)) { printf("vdso temp file create fail at %s\n", tempFileName.c_str()); diff --git a/test/unittest/common/native/hiperf_client_test.cpp b/test/unittest/common/native/hiperf_client_test.cpp index 22c390e..2f079c9 100644 --- a/test/unittest/common/native/hiperf_client_test.cpp +++ b/test/unittest/common/native/hiperf_client_test.cpp @@ -81,7 +81,7 @@ HWTEST_F(HiperfClientTest, OutDir, TestSize.Level1) StdoutRecord stdoutRecord; stdoutRecord.Start(); - HiperfClient::Client myHiperf("/data/local/tmp/"); + HiperfClient::Client myHiperf("/data/log/hiperf/"); myHiperf.SetDebugMode(); ASSERT_TRUE(myHiperf.Start()); @@ -321,7 +321,7 @@ HWTEST_F(HiperfClientTest, SetSymbolDir, TestSize.Level1) HiperfClient::RecordOption opt; vector selectPids = {getpid()}; opt.SetSelectPids(selectPids); - opt.SetSymbolDir("/data/local/tmp/"); + opt.SetSymbolDir("/data/log/hiperf/"); TestCaseOption(opt); } diff --git a/test/unittest/common/native/hiperf_libreport_test.cpp b/test/unittest/common/native/hiperf_libreport_test.cpp index 42ee290..9e70424 100644 --- a/test/unittest/common/native/hiperf_libreport_test.cpp +++ b/test/unittest/common/native/hiperf_libreport_test.cpp @@ -86,7 +86,7 @@ void HiperfLibReportTest::DefaultSymbolsBuildIdContentCheck(const std::string &c "libace.z.so,b8d9d3bb0184ba917e8d05d471e8387a],[/system/lib/" "libeventhandler.z.so,b1e08a8a6eabe33363f721b14393b06b],[/system/bin/" "hilogd,b11a9f3700884ded33879f81914e3aa2],[/system/bin/" - "wifi_hal_service,6beba486dcdf5debb5c9248bc5cdf5f0],[/data/local/tmp/" + "wifi_hal_service,6beba486dcdf5debb5c9248bc5cdf5f0],[/data/log/hiperf/" "hiperf,32aa1e9c5f35d49e16fa1b6e86db130c],[/system/bin/" "hiview,419493d9ccef1df5dedfa4a144249e49],[/system/lib/" "libhiviewbase.z.so,349d82d4f1d2dc21c039156afbe470ad],[/system/lib/" diff --git a/test/unittest/common/native/include/callstack_test.h b/test/unittest/common/native/include/callstack_test.h index 01414c3..f3a2db5 100644 --- a/test/unittest/common/native/include/callstack_test.h +++ b/test/unittest/common/native/include/callstack_test.h @@ -54,22 +54,22 @@ static const std::string TEST_DWARF_ELF = "hiperf_example_cmd"; record mmap2: type 10, misc 2, size 107 pid 643, tid 643, addr 0x454000, len 0x3000 pgoff 0x0, maj 179, min 7, ino 4868, ino_generation 6874019636378171493 - prot 1, flags 2, filename /data/local/tmp/hiperf_example_cmd + prot 1, flags 2, filename /data/log/hiperf/hiperf_example_cmd record mmap2: type 10, misc 2, size 107 pid 643, tid 643, addr 0x457000, len 0x5000 pgoff 0x2000, maj 179, min 7, ino 4868, ino_generation 7237954708011182952 - prot 5, flags 2, filename /data/local/tmp/hiperf_example_cmd + prot 5, flags 2, filename /data/log/hiperf/hiperf_example_cmd record mmap2: type 10, misc 2, size 107 pid 643, tid 643, addr 0x45c000, len 0x1000 pgoff 0x6000, maj 179, min 7, ino 4868, ino_generation 7237954708011182952 - prot 1, flags 2, filename /data/local/tmp/hiperf_example_cmd + prot 1, flags 2, filename /data/log/hiperf/hiperf_example_cmd record mmap2: type 10, misc 2, size 107 pid 643, tid 643, addr 0x45d000, len 0x1000 pgoff 0x6000, maj 179, min 7, ino 4868, ino_generation 7237954708011182952 - prot 3, flags 2, filename /data/local/tmp/hiperf_example_cmd + prot 3, flags 2, filename /data/log/hiperf/hiperf_example_cmd */ static const std::vector TEST_DWARF_MMAP = { {"hiperf_example_cmd", 0x454000, 0x3000, 0x0}, @@ -109,17 +109,17 @@ static const std::string TEST_DWARF_ELF = "hiperf_example_cmd_64"; record mmap2: type 10, misc 2, size 110 pid 24925, tid 24925, addr 0x5591ef4000, len 0x3000 pgoff 0x0, maj 179, min 11, ino 2495283, ino_generation 0 - prot 1, flags 2, filename /data/local/tmp/hiperf_example_cmd_64 + prot 1, flags 2, filename /data/log/hiperf/hiperf_example_cmd_64 record mmap2: type 10, misc 2, size 110 pid 24925, tid 24925, addr 0x5591ef7000, len 0x3000 pgoff 0x2000, maj 179, min 11, ino 2495283, ino_generation 0 - prot 5, flags 2, filename /data/local/tmp/hiperf_example_cmd_64 + prot 5, flags 2, filename /data/log/hiperf/hiperf_example_cmd_64 record mmap2: type 10, misc 2, size 110 pid 24925, tid 24925, addr 0x5591efa000, len 0x1000 pgoff 0x4000, maj 179, min 11, ino 2495283, ino_generation 0 - prot 1, flags 2, filename /data/local/tmp/hiperf_example_cmd_64 + prot 1, flags 2, filename /data/log/hiperf/hiperf_example_cmd_64 */ static const std::vector TEST_DWARF_MMAP = { {"hiperf_example_cmd_64", 0x5591ef4000, 0x3000, 0x0}, diff --git a/test/unittest/common/native/subcommand_record_test.cpp b/test/unittest/common/native/subcommand_record_test.cpp index b76267d..2c24a30 100644 --- a/test/unittest/common/native/subcommand_record_test.cpp +++ b/test/unittest/common/native/subcommand_record_test.cpp @@ -704,7 +704,7 @@ HWTEST_F(SubCommandRecordTest, MmapPagesInputErr, TestSize.Level1) // output file name HWTEST_F(SubCommandRecordTest, OutputFileName, TestSize.Level1) { - TestRecordCommand("-d 2 -o /data/local/tmp/output.perf.data "); + TestRecordCommand("-d 2 -o /data/log/hiperf/output.perf.data "); } HWTEST_F(SubCommandRecordTest, OutputFileNameErr, TestSize.Level1) diff --git a/test/unittest/resource/testdata/report_test_callstack.txt b/test/unittest/resource/testdata/report_test_callstack.txt index 52920d5..874e460 100644 --- a/test/unittest/resource/testdata/report_test_callstack.txt +++ b/test/unittest/resource/testdata/report_test_callstack.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data +cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_diff.txt b/test/unittest/resource/testdata/report_test_diff.txt index bbd881d..c962d9d 100644 --- a/test/unittest/resource/testdata/report_test_diff.txt +++ b/test/unittest/resource/testdata/report_test_diff.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data +cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_dsos.txt b/test/unittest/resource/testdata/report_test_dsos.txt index 241c67d..73d7422 100644 --- a/test/unittest/resource/testdata/report_test_dsos.txt +++ b/test/unittest/resource/testdata/report_test_dsos.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data +cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_funcs.txt b/test/unittest/resource/testdata/report_test_funcs.txt index cfddf57..a0d5360 100644 --- a/test/unittest/resource/testdata/report_test_funcs.txt +++ b/test/unittest/resource/testdata/report_test_funcs.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data +cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_i.txt b/test/unittest/resource/testdata/report_test_i.txt index 2d11485..c58283c 100644 --- a/test/unittest/resource/testdata/report_test_i.txt +++ b/test/unittest/resource/testdata/report_test_i.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data +cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_limit.txt b/test/unittest/resource/testdata/report_test_limit.txt index d5e5d3a..a7d2a7f 100644 --- a/test/unittest/resource/testdata/report_test_limit.txt +++ b/test/unittest/resource/testdata/report_test_limit.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data +cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_limit1.txt b/test/unittest/resource/testdata/report_test_limit1.txt index 621a9dc..7f5e6b4 100644 --- a/test/unittest/resource/testdata/report_test_limit1.txt +++ b/test/unittest/resource/testdata/report_test_limit1.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data +cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_sort1.txt b/test/unittest/resource/testdata/report_test_sort1.txt index 801c0e9..807ad10 100644 --- a/test/unittest/resource/testdata/report_test_sort1.txt +++ b/test/unittest/resource/testdata/report_test_sort1.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data +cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_sort2.txt b/test/unittest/resource/testdata/report_test_sort2.txt index 002225c..f1d962d 100644 --- a/test/unittest/resource/testdata/report_test_sort2.txt +++ b/test/unittest/resource/testdata/report_test_sort2.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data +cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_symbol.txt b/test/unittest/resource/testdata/report_test_symbol.txt index 2d11485..c58283c 100644 --- a/test/unittest/resource/testdata/report_test_symbol.txt +++ b/test/unittest/resource/testdata/report_test_symbol.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data +cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_tids.txt b/test/unittest/resource/testdata/report_test_tids.txt index c3a1199..c9d2e76 100644 --- a/test/unittest/resource/testdata/report_test_tids.txt +++ b/test/unittest/resource/testdata/report_test_tids.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data +cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_tids1.txt b/test/unittest/resource/testdata/report_test_tids1.txt index a8c9221..df1e64c 100644 --- a/test/unittest/resource/testdata/report_test_tids1.txt +++ b/test/unittest/resource/testdata/report_test_tids1.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data +cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) -- Gitee From 3bc54e6f2ace4a38d4c28349a0d09c7ca5ff2786 Mon Sep 17 00:00:00 2001 From: zhangcui Date: Wed, 21 Sep 2022 06:52:44 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangcui --- test/unittest/common/native/hiperf_libreport_test.cpp | 2 +- test/unittest/resource/testdata/report_test_callstack.txt | 2 +- test/unittest/resource/testdata/report_test_diff.txt | 2 +- test/unittest/resource/testdata/report_test_dsos.txt | 2 +- test/unittest/resource/testdata/report_test_funcs.txt | 2 +- test/unittest/resource/testdata/report_test_i.txt | 2 +- test/unittest/resource/testdata/report_test_limit.txt | 2 +- test/unittest/resource/testdata/report_test_limit1.txt | 2 +- test/unittest/resource/testdata/report_test_sort1.txt | 2 +- test/unittest/resource/testdata/report_test_sort2.txt | 2 +- test/unittest/resource/testdata/report_test_symbol.txt | 2 +- test/unittest/resource/testdata/report_test_tids.txt | 2 +- test/unittest/resource/testdata/report_test_tids1.txt | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/unittest/common/native/hiperf_libreport_test.cpp b/test/unittest/common/native/hiperf_libreport_test.cpp index 9e70424..42ee290 100644 --- a/test/unittest/common/native/hiperf_libreport_test.cpp +++ b/test/unittest/common/native/hiperf_libreport_test.cpp @@ -86,7 +86,7 @@ void HiperfLibReportTest::DefaultSymbolsBuildIdContentCheck(const std::string &c "libace.z.so,b8d9d3bb0184ba917e8d05d471e8387a],[/system/lib/" "libeventhandler.z.so,b1e08a8a6eabe33363f721b14393b06b],[/system/bin/" "hilogd,b11a9f3700884ded33879f81914e3aa2],[/system/bin/" - "wifi_hal_service,6beba486dcdf5debb5c9248bc5cdf5f0],[/data/log/hiperf/" + "wifi_hal_service,6beba486dcdf5debb5c9248bc5cdf5f0],[/data/local/tmp/" "hiperf,32aa1e9c5f35d49e16fa1b6e86db130c],[/system/bin/" "hiview,419493d9ccef1df5dedfa4a144249e49],[/system/lib/" "libhiviewbase.z.so,349d82d4f1d2dc21c039156afbe470ad],[/system/lib/" diff --git a/test/unittest/resource/testdata/report_test_callstack.txt b/test/unittest/resource/testdata/report_test_callstack.txt index 874e460..52920d5 100644 --- a/test/unittest/resource/testdata/report_test_callstack.txt +++ b/test/unittest/resource/testdata/report_test_callstack.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data +cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_diff.txt b/test/unittest/resource/testdata/report_test_diff.txt index c962d9d..bbd881d 100644 --- a/test/unittest/resource/testdata/report_test_diff.txt +++ b/test/unittest/resource/testdata/report_test_diff.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data +cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_dsos.txt b/test/unittest/resource/testdata/report_test_dsos.txt index 73d7422..241c67d 100644 --- a/test/unittest/resource/testdata/report_test_dsos.txt +++ b/test/unittest/resource/testdata/report_test_dsos.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data +cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_funcs.txt b/test/unittest/resource/testdata/report_test_funcs.txt index a0d5360..cfddf57 100644 --- a/test/unittest/resource/testdata/report_test_funcs.txt +++ b/test/unittest/resource/testdata/report_test_funcs.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data +cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_i.txt b/test/unittest/resource/testdata/report_test_i.txt index c58283c..2d11485 100644 --- a/test/unittest/resource/testdata/report_test_i.txt +++ b/test/unittest/resource/testdata/report_test_i.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data +cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_limit.txt b/test/unittest/resource/testdata/report_test_limit.txt index a7d2a7f..d5e5d3a 100644 --- a/test/unittest/resource/testdata/report_test_limit.txt +++ b/test/unittest/resource/testdata/report_test_limit.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data +cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_limit1.txt b/test/unittest/resource/testdata/report_test_limit1.txt index 7f5e6b4..621a9dc 100644 --- a/test/unittest/resource/testdata/report_test_limit1.txt +++ b/test/unittest/resource/testdata/report_test_limit1.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data +cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_sort1.txt b/test/unittest/resource/testdata/report_test_sort1.txt index 807ad10..801c0e9 100644 --- a/test/unittest/resource/testdata/report_test_sort1.txt +++ b/test/unittest/resource/testdata/report_test_sort1.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data +cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_sort2.txt b/test/unittest/resource/testdata/report_test_sort2.txt index f1d962d..002225c 100644 --- a/test/unittest/resource/testdata/report_test_sort2.txt +++ b/test/unittest/resource/testdata/report_test_sort2.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data +cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_symbol.txt b/test/unittest/resource/testdata/report_test_symbol.txt index c58283c..2d11485 100644 --- a/test/unittest/resource/testdata/report_test_symbol.txt +++ b/test/unittest/resource/testdata/report_test_symbol.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data +cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_tids.txt b/test/unittest/resource/testdata/report_test_tids.txt index c9d2e76..c3a1199 100644 --- a/test/unittest/resource/testdata/report_test_tids.txt +++ b/test/unittest/resource/testdata/report_test_tids.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data +cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) diff --git a/test/unittest/resource/testdata/report_test_tids1.txt b/test/unittest/resource/testdata/report_test_tids1.txt index df1e64c..a8c9221 100644 --- a/test/unittest/resource/testdata/report_test_tids1.txt +++ b/test/unittest/resource/testdata/report_test_tids1.txt @@ -5,7 +5,7 @@ hostname: localhost osrelease: 5.10.57 arch: armv7l cpudesc: ARMv7 Processor rev 5 (v7l) -cmdline: hiperf record -d 1 -o /data/log/hiperf/dlh.data +cmdline: hiperf record -d 1 -o /data/local/tmp/dlh.data hiperf_record_time: Thu Jan 1 01:18:34 1970 Event: hw-cpu-cycles (type 0 id 0) -- Gitee