From c4331f114afd701fce24bf823999bb4583a51160 Mon Sep 17 00:00:00 2001 From: yuyanqinghw Date: Thu, 7 Aug 2025 09:19:20 +0800 Subject: [PATCH] clear alarms Signed-off-by: yuyanqinghw --- src/perf_event_record.cpp | 3 ++- src/subcommand_record.cpp | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/perf_event_record.cpp b/src/perf_event_record.cpp index cd4fc75..d6d9695 100644 --- a/src/perf_event_record.cpp +++ b/src/perf_event_record.cpp @@ -664,8 +664,9 @@ void PerfRecordSample::DumpData(int indent) const if (sampleType_ & PERF_SAMPLE_TIME) { PRINT_INDENT(indent, "time %llu\n", data_.time); } + // PERF_SAMPLE_ADDR is not enabled, delete output if (sampleType_ & PERF_SAMPLE_ADDR) { - PRINT_INDENT(indent, "addr %p\n", reinterpret_cast(data_.addr)); + PRINT_INDENT(indent, "addr\n"); } if (sampleType_ & PERF_SAMPLE_STREAM_ID) { PRINT_INDENT(indent, "stream_id %" PRIu64 "\n", static_cast(data_.stream_id)); diff --git a/src/subcommand_record.cpp b/src/subcommand_record.cpp index f147db6..a5075a5 100644 --- a/src/subcommand_record.cpp +++ b/src/subcommand_record.cpp @@ -2028,7 +2028,6 @@ void SubCommandRecord::AddCommandLineFeature() std::string fullCommandline = ReadFileToString("/proc/self/cmdline").c_str() + Command::fullArgument; fileWriter_->AddStringFeature(FEATURE::CMDLINE, fullCommandline); - HIPERF_HILOGI(MODULE_DEFAULT, "cmd : %{public}s", fullCommandline.c_str()); } void SubCommandRecord::AddCpuOffFeature() @@ -2214,7 +2213,7 @@ void SubCommandRecord::CollectSymbol(PerfRecordSample *sample) } serverPid = sample->GetServerPidof(i); - if (!isRoot_ && serverPid == devhostPid_) { + if (!isRoot_ && static_cast(serverPid) == devhostPid_) { // in func UpdateDevHostCallChains add offset_ to ips, need sub offset_ when symboling if (sample->data_.ips[i] > offset_) { sample->data_.ips[i] -= offset_; @@ -2527,10 +2526,10 @@ void SubCommandRecord::UpdateDevHostMaps(PerfEventRecord& record) void SubCommandRecord::UpdateDevHostCallChains(PerfEventRecord& record) { if (record.GetType() == PERF_RECORD_SAMPLE) { - pid_t serverPid; + uint32_t serverPid; const uint64_t BAD_IP_ADDRESS = 2; auto sample = static_cast(&record); - serverPid = sample->GetServerPidof(0); + serverPid = static_cast(sample->GetServerPidof(0)); if (serverPid == devhostPid_) { sample->data_.ip += offset_; } @@ -2538,7 +2537,7 @@ void SubCommandRecord::UpdateDevHostCallChains(PerfEventRecord& record) if (sample->data_.ips[i] >= PERF_CONTEXT_MAX || sample->data_.ips[i] < BAD_IP_ADDRESS) { continue; } - serverPid = sample->GetServerPidof(i); + serverPid = static_cast(sample->GetServerPidof(i)); if (serverPid == devhostPid_) { sample->data_.ips[i] += offset_; } -- Gitee