Rename PerfDataParser to RecordParser
We are actually parsing records and the class is in the perf_importer
namespace (so no need for the Perf prefix)
Bug: b/334978369
Change-Id: I04355b1b62991fe8b543e180da2ef50c88443903
diff --git a/Android.bp b/Android.bp
index 730be5c..0ce4f00 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12239,9 +12239,9 @@
name: "perfetto_src_trace_processor_importers_perf_perf",
srcs: [
"src/trace_processor/importers/perf/attrs_section_reader.cc",
- "src/trace_processor/importers/perf/perf_data_parser.cc",
"src/trace_processor/importers/perf/perf_data_tokenizer.cc",
"src/trace_processor/importers/perf/perf_data_tracker.cc",
+ "src/trace_processor/importers/perf/record_parser.cc",
],
}
diff --git a/BUILD b/BUILD
index 7f08025..0ace008 100644
--- a/BUILD
+++ b/BUILD
@@ -1706,14 +1706,13 @@
srcs = [
"src/trace_processor/importers/perf/attrs_section_reader.cc",
"src/trace_processor/importers/perf/attrs_section_reader.h",
- "src/trace_processor/importers/perf/perf_data_parser.cc",
- "src/trace_processor/importers/perf/perf_data_parser.h",
"src/trace_processor/importers/perf/perf_data_tokenizer.cc",
"src/trace_processor/importers/perf/perf_data_tokenizer.h",
"src/trace_processor/importers/perf/perf_data_tracker.cc",
"src/trace_processor/importers/perf/perf_data_tracker.h",
"src/trace_processor/importers/perf/perf_file.h",
- "src/trace_processor/importers/perf/reader.h",
+ "src/trace_processor/importers/perf/record_parser.cc",
+ "src/trace_processor/importers/perf/record_parser.h",
],
)
diff --git a/src/trace_processor/importers/perf/BUILD.gn b/src/trace_processor/importers/perf/BUILD.gn
index 1cce0d5..f87eeda 100644
--- a/src/trace_processor/importers/perf/BUILD.gn
+++ b/src/trace_processor/importers/perf/BUILD.gn
@@ -40,14 +40,13 @@
sources = [
"attrs_section_reader.cc",
"attrs_section_reader.h",
- "perf_data_parser.cc",
- "perf_data_parser.h",
"perf_data_tokenizer.cc",
"perf_data_tokenizer.h",
"perf_data_tracker.cc",
"perf_data_tracker.h",
"perf_file.h",
- "reader.h",
+ "record_parser.cc",
+ "record_parser.h",
]
public_deps = [ ":record" ]
deps = [
diff --git a/src/trace_processor/importers/perf/perf_data_parser.cc b/src/trace_processor/importers/perf/record_parser.cc
similarity index 93%
rename from src/trace_processor/importers/perf/perf_data_parser.cc
rename to src/trace_processor/importers/perf/record_parser.cc
index 9b7db3a..847adb7 100644
--- a/src/trace_processor/importers/perf/perf_data_parser.cc
+++ b/src/trace_processor/importers/perf/record_parser.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/importers/perf/perf_data_parser.h"
+#include "src/trace_processor/importers/perf/record_parser.h"
#include <optional>
#include <string>
@@ -39,18 +39,18 @@
using FramesTable = tables::StackProfileFrameTable;
using CallsitesTable = tables::StackProfileCallsiteTable;
-PerfDataParser::PerfDataParser(TraceProcessorContext* context)
+RecordParser::RecordParser(TraceProcessorContext* context)
: context_(context), tracker_(PerfDataTracker::GetOrCreate(context_)) {}
-PerfDataParser::~PerfDataParser() = default;
+RecordParser::~RecordParser() = default;
-void PerfDataParser::ParsePerfRecord(int64_t ts, Record record) {
+void RecordParser::ParsePerfRecord(int64_t ts, Record record) {
if (base::Status status = ParseRecord(ts, std::move(record)); !status.ok()) {
context_->storage->IncrementStats(stats::perf_record_skipped);
}
}
-base::Status PerfDataParser::ParseRecord(int64_t ts, Record record) {
+base::Status RecordParser::ParseRecord(int64_t ts, Record record) {
switch (record.header.type) {
case PERF_RECORD_SAMPLE:
return ParseSample(ts, std::move(record));
@@ -71,7 +71,7 @@
return base::OkStatus();
}
-base::Status PerfDataParser::ParseSample(int64_t ts, Record record) {
+base::Status RecordParser::ParseSample(int64_t ts, Record record) {
PERFETTO_CHECK(record.attr);
Reader reader(record.payload.copy());
@@ -157,7 +157,7 @@
return base::OkStatus();
}
-base::Status PerfDataParser::ParseMmap2(Record record) {
+base::Status RecordParser::ParseMmap2(Record record) {
Reader reader(record.payload.copy());
PerfDataTracker::Mmap2Record mmap2;
reader.Read(mmap2.num);
diff --git a/src/trace_processor/importers/perf/perf_data_parser.h b/src/trace_processor/importers/perf/record_parser.h
similarity index 80%
rename from src/trace_processor/importers/perf/perf_data_parser.h
rename to src/trace_processor/importers/perf/record_parser.h
index 989f883..bae837a 100644
--- a/src/trace_processor/importers/perf/perf_data_parser.h
+++ b/src/trace_processor/importers/perf/record_parser.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_IMPORTERS_PERF_PERF_DATA_PARSER_H_
-#define SRC_TRACE_PROCESSOR_IMPORTERS_PERF_PERF_DATA_PARSER_H_
+#ifndef SRC_TRACE_PROCESSOR_IMPORTERS_PERF_RECORD_PARSER_H_
+#define SRC_TRACE_PROCESSOR_IMPORTERS_PERF_RECORD_PARSER_H_
#include <stdint.h>
@@ -27,10 +27,10 @@
namespace perf_importer {
// Parses samples from perf.data files.
-class PerfDataParser : public PerfRecordParser {
+class RecordParser : public PerfRecordParser {
public:
- explicit PerfDataParser(TraceProcessorContext*);
- ~PerfDataParser() override;
+ explicit RecordParser(TraceProcessorContext*);
+ ~RecordParser() override;
void ParsePerfRecord(int64_t timestamp, Record record) override;
@@ -47,4 +47,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_IMPORTERS_PERF_PERF_DATA_PARSER_H_
+#endif // SRC_TRACE_PROCESSOR_IMPORTERS_PERF_RECORD_PARSER_H_
diff --git a/src/trace_processor/trace_processor_impl.cc b/src/trace_processor/trace_processor_impl.cc
index 7833c2c..fb9b294 100644
--- a/src/trace_processor/trace_processor_impl.cc
+++ b/src/trace_processor/trace_processor_impl.cc
@@ -54,8 +54,8 @@
#include "src/trace_processor/importers/json/json_trace_tokenizer.h"
#include "src/trace_processor/importers/json/json_utils.h"
#include "src/trace_processor/importers/ninja/ninja_log_parser.h"
-#include "src/trace_processor/importers/perf/perf_data_parser.h"
#include "src/trace_processor/importers/perf/perf_data_tokenizer.h"
+#include "src/trace_processor/importers/perf/record_parser.h"
#include "src/trace_processor/importers/proto/additional_modules.h"
#include "src/trace_processor/importers/proto/content_analyzer.h"
#include "src/trace_processor/importers/systrace/systrace_trace_parser.h"
@@ -355,7 +355,7 @@
->RegisterTraceReader<perf_importer::PerfDataTokenizer>(
kPerfDataTraceType);
context_.perf_record_parser =
- std::make_unique<perf_importer::PerfDataParser>(&context_);
+ std::make_unique<perf_importer::RecordParser>(&context_);
if (util::IsGzipSupported()) {
context_.reader_registry->RegisterTraceReader<GzipTraceParser>(
