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 64556fc6ba3525d93fa52b2643e54715a7ffbfa7..fd424e2efc517042491f2358a20094623141738f 100644 --- a/trace_streamer/src/parser/rawtrace_parser/ftrace_event_processor.cpp +++ b/trace_streamer/src/parser/rawtrace_parser/ftrace_event_processor.cpp @@ -199,11 +199,7 @@ bool FtraceEventProcessor::SchedBlockedReason(FtraceEvent& ftraceEvent, uint8_t index = 0; auto schedBlockedMsg = ftraceEvent.mutable_sched_blocked_reason_format(); schedBlockedMsg->set_pid(FtraceFieldProcessor::HandleIntField(format.fields, index++, data, size)); - if (format.eventId >= HM_EVENT_ID_OFFSET) { - (void)FtraceFieldProcessor::HandleStrField(format.fields, index++, data, size); - } else { - schedBlockedMsg->set_caller(FtraceFieldProcessor::HandleIntField(format.fields, index++, data, size)); - } + schedBlockedMsg->set_caller(FtraceFieldProcessor::HandleIntField(format.fields, index++, data, size)); schedBlockedMsg->set_io_wait(FtraceFieldProcessor::HandleIntField(format.fields, index++, data, size)); return true; } diff --git a/trace_streamer/src/parser/rawtrace_parser/ftrace_processor.cpp b/trace_streamer/src/parser/rawtrace_parser/ftrace_processor.cpp index 3ad652d686324dab2dde49a85896de17c56fc3fe..0452e83ad867b96ae8ce3c60f01a6dc487f7895d 100644 --- a/trace_streamer/src/parser/rawtrace_parser/ftrace_processor.cpp +++ b/trace_streamer/src/parser/rawtrace_parser/ftrace_processor.cpp @@ -654,7 +654,6 @@ bool FtraceProcessor::HmParsePageData(FtraceCpuDetailMsg& cpuMsg, CpuDetailParse unsigned int evtSize; unsigned int eventId; EventFormat format = {}; - int num = 0; cpuMsg.set_cpu(rmqData->coreId); cpuMsg.set_overwrite(0); @@ -678,15 +677,12 @@ bool FtraceProcessor::HmParsePageData(FtraceCpuDetailMsg& cpuMsg, CpuDetailParse if (FtraceEventProcessor::GetInstance().IsSupported(format.eventId)) { std::unique_ptr ftraceEvent = std::make_unique(); ftraceEvent->set_timestamp(event->timeStampOffset + timeStampBase); - ftraceEvent->set_tgid(header->tgid); - ftraceEvent->set_comm(header->tcbName); HandleFtraceEvent(*ftraceEvent, reinterpret_cast(header), evtSize, format); std::unique_ptr eventInfo = std::make_unique(); eventInfo->cpuId = cpuMsg.cpu(); eventInfo->eventId = eventId; eventInfo->msgPtr = std::move(ftraceEvent); cpuDetailParser.EventAppend(std::move(eventInfo)); - num++; } else { TS_LOGD( "mark.debug. evtId = %u evtSize = %u format.eventId = %u format.evtSize = %u"