diff --git a/pmu/pmu_event.h b/pmu/pmu_event.h index da31525d9bf3255b3c52531016d41f8a13bd450b..cf5a767284b13cb750278e296c6a6be148e189bb 100644 --- a/pmu/pmu_event.h +++ b/pmu/pmu_event.h @@ -207,7 +207,7 @@ struct EventData { std::vector sampleIps; std::vector extPool; std::vector switchData; - std::vector metaData; + std::vector metaData; }; int MapErrno(int sysErr); diff --git a/pmu/pmu_list.cpp b/pmu/pmu_list.cpp index 95cf50330f12c9d4e0d538e4c21ea11ea56773b0..af9b3572a520d759a85fa0a78f35d9cff8f2bb26 100644 --- a/pmu/pmu_list.cpp +++ b/pmu/pmu_list.cpp @@ -752,11 +752,11 @@ namespace KUNPENG_PMU { return SUCCESS; } - std::vector PmuList::GetMetaData(PmuData* pmuData) const + std::vector PmuList::GetMetaData(PmuData* pmuData) const { auto findData = userDataList.find(pmuData); if (findData == userDataList.end()) { - return vector(); + return vector(); } return findData->second.metaData; } diff --git a/pmu/pmu_list.h b/pmu/pmu_list.h index 3d0e67849f4d9abf165b3e310f0939458fa7d4cd..db00184d3ac146e34ae5162bf06a94861fe6f864 100644 --- a/pmu/pmu_list.h +++ b/pmu/pmu_list.h @@ -85,7 +85,7 @@ public: void FillPidList(const unsigned pd, unsigned numPid, int* pidList); int ResolvePmuDataSymbol(struct PmuData* iPmuData); - std::vector GetMetaData(PmuData* pmuData) const; + std::vector GetMetaData(PmuData* pmuData) const; void AddNewProcess(const unsigned &pd, int pid); private: diff --git a/pmu/sampler.cpp b/pmu/sampler.cpp index 5bd2ebdba359099bf08f1a2e143a208eee8f10ef..72c201776a5da8c3a399be3d8b1018bfa22eec91 100644 --- a/pmu/sampler.cpp +++ b/pmu/sampler.cpp @@ -296,7 +296,7 @@ void KUNPENG_PMU::PerfSampler::ReadRingBuffer(EventData &eventData) break; } case PERF_RECORD_MMAP: { - eventData.metaData.push_back(*event); + eventData.metaData.push_back(event->sample); if (symMode == RESOLVE_ELF_DWARF || symMode == NO_SYMBOL_RESOLVE) { SymResolverUpdateModule(event->mmap.tid, event->mmap.filename, event->mmap.addr); } else if (symMode == RESOLVE_ELF) { @@ -305,7 +305,7 @@ void KUNPENG_PMU::PerfSampler::ReadRingBuffer(EventData &eventData) break; } case PERF_RECORD_MMAP2: { - eventData.metaData.push_back(*event); + eventData.metaData.push_back(event->sample); if (symMode == RESOLVE_ELF_DWARF || symMode == NO_SYMBOL_RESOLVE) { SymResolverUpdateModule(event->mmap2.tid, event->mmap2.filename, event->mmap2.addr); } else if (symMode == RESOLVE_ELF) { @@ -315,12 +315,12 @@ void KUNPENG_PMU::PerfSampler::ReadRingBuffer(EventData &eventData) } case PERF_RECORD_FORK: { DBG_PRINT("Fork ptid: %d tid: %d\n", event->fork.pid, event->fork.tid); - eventData.metaData.push_back(*event); + eventData.metaData.push_back(event->sample); UpdatePidInfo(event->fork.tid); break; } case PERF_RECORD_COMM: { - eventData.metaData.push_back(*event); + eventData.metaData.push_back(event->sample); UpdateCommInfo(event); break; }