processor: Move proto_trace_parser/tokenizer to importers/proto/
Simple file move, no further changes.
Bug: 141459049
Change-Id: I0d6855b280f76b90ba458bd0600834c11444ba2a
diff --git a/Android.bp b/Android.bp
index 3b14ab4..8080ae2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4564,6 +4564,8 @@
"src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.cc",
"src/trace_processor/importers/fuchsia/fuchsia_trace_utils.cc",
"src/trace_processor/importers/proto/graphics_event_parser.cc",
+ "src/trace_processor/importers/proto/proto_trace_parser.cc",
+ "src/trace_processor/importers/proto/proto_trace_tokenizer.cc",
"src/trace_processor/importers/proto/track_event_parser.cc",
"src/trace_processor/importers/proto/track_event_tokenizer.cc",
"src/trace_processor/importers/systrace/systrace_parser.cc",
@@ -4572,8 +4574,6 @@
"src/trace_processor/metadata_table.cc",
"src/trace_processor/process_table.cc",
"src/trace_processor/process_tracker.cc",
- "src/trace_processor/proto_trace_parser.cc",
- "src/trace_processor/proto_trace_tokenizer.cc",
"src/trace_processor/raw_table.cc",
"src/trace_processor/read_trace.cc",
"src/trace_processor/row_iterators.cc",
@@ -4666,12 +4666,12 @@
"src/trace_processor/ftrace_utils_unittest.cc",
"src/trace_processor/heap_profile_tracker_unittest.cc",
"src/trace_processor/importers/fuchsia/fuchsia_trace_utils_unittest.cc",
+ "src/trace_processor/importers/proto/proto_trace_parser_unittest.cc",
"src/trace_processor/importers/systrace/systrace_parser_unittest.cc",
"src/trace_processor/metadata_table_unittest.cc",
"src/trace_processor/null_term_string_view_unittest.cc",
"src/trace_processor/process_table_unittest.cc",
"src/trace_processor/process_tracker_unittest.cc",
- "src/trace_processor/proto_trace_parser_unittest.cc",
"src/trace_processor/sched_slice_table_unittest.cc",
"src/trace_processor/slice_tracker_unittest.cc",
"src/trace_processor/span_join_operator_table_unittest.cc",
diff --git a/BUILD b/BUILD
index 587d616..59f7067 100644
--- a/BUILD
+++ b/BUILD
@@ -689,6 +689,10 @@
"src/trace_processor/importers/proto/packet_sequence_state.h",
"src/trace_processor/importers/proto/proto_importer_module.h",
"src/trace_processor/importers/proto/proto_incremental_state.h",
+ "src/trace_processor/importers/proto/proto_trace_parser.cc",
+ "src/trace_processor/importers/proto/proto_trace_parser.h",
+ "src/trace_processor/importers/proto/proto_trace_tokenizer.cc",
+ "src/trace_processor/importers/proto/proto_trace_tokenizer.h",
"src/trace_processor/importers/proto/track_event_module.h",
"src/trace_processor/importers/proto/track_event_parser.cc",
"src/trace_processor/importers/proto/track_event_parser.h",
@@ -707,10 +711,6 @@
"src/trace_processor/process_table.h",
"src/trace_processor/process_tracker.cc",
"src/trace_processor/process_tracker.h",
- "src/trace_processor/proto_trace_parser.cc",
- "src/trace_processor/proto_trace_parser.h",
- "src/trace_processor/proto_trace_tokenizer.cc",
- "src/trace_processor/proto_trace_tokenizer.h",
"src/trace_processor/raw_table.cc",
"src/trace_processor/raw_table.h",
"src/trace_processor/read_trace.cc",
diff --git a/src/trace_processor/BUILD.gn b/src/trace_processor/BUILD.gn
index ccd339d..f305c59 100644
--- a/src/trace_processor/BUILD.gn
+++ b/src/trace_processor/BUILD.gn
@@ -91,6 +91,10 @@
"importers/proto/packet_sequence_state.h",
"importers/proto/proto_importer_module.h",
"importers/proto/proto_incremental_state.h",
+ "importers/proto/proto_trace_parser.cc",
+ "importers/proto/proto_trace_parser.h",
+ "importers/proto/proto_trace_tokenizer.cc",
+ "importers/proto/proto_trace_tokenizer.h",
"importers/proto/track_event_module.h",
"importers/proto/track_event_parser.cc",
"importers/proto/track_event_parser.h",
@@ -107,10 +111,6 @@
"process_table.h",
"process_tracker.cc",
"process_tracker.h",
- "proto_trace_parser.cc",
- "proto_trace_parser.h",
- "proto_trace_tokenizer.cc",
- "proto_trace_tokenizer.h",
"raw_table.cc",
"raw_table.h",
"read_trace.cc",
@@ -317,12 +317,12 @@
"filtered_row_index_unittest.cc",
"forwarding_trace_parser_unittest.cc",
"heap_profile_tracker_unittest.cc",
+ "importers/proto/proto_trace_parser_unittest.cc",
"importers/systrace/systrace_parser_unittest.cc",
"metadata_table_unittest.cc",
"null_term_string_view_unittest.cc",
"process_table_unittest.cc",
"process_tracker_unittest.cc",
- "proto_trace_parser_unittest.cc",
"slice_tracker_unittest.cc",
"span_join_operator_table_unittest.cc",
"string_pool_unittest.cc",
diff --git a/src/trace_processor/forwarding_trace_parser.cc b/src/trace_processor/forwarding_trace_parser.cc
index 3ea88e4..07934cb 100644
--- a/src/trace_processor/forwarding_trace_parser.cc
+++ b/src/trace_processor/forwarding_trace_parser.cc
@@ -19,9 +19,9 @@
#include "perfetto/base/logging.h"
#include "perfetto/ext/base/string_utils.h"
#include "src/trace_processor/gzip_trace_parser.h"
+#include "src/trace_processor/importers/proto/proto_trace_parser.h"
+#include "src/trace_processor/importers/proto/proto_trace_tokenizer.h"
#include "src/trace_processor/importers/systrace/systrace_trace_parser.h"
-#include "src/trace_processor/proto_trace_parser.h"
-#include "src/trace_processor/proto_trace_tokenizer.h"
#include "src/trace_processor/trace_sorter.h"
#if PERFETTO_BUILDFLAG(PERFETTO_TP_FUCHSIA)
diff --git a/src/trace_processor/proto_trace_parser.cc b/src/trace_processor/importers/proto/proto_trace_parser.cc
similarity index 99%
rename from src/trace_processor/proto_trace_parser.cc
rename to src/trace_processor/importers/proto/proto_trace_parser.cc
index 8035336..867f61b 100644
--- a/src/trace_processor/proto_trace_parser.cc
+++ b/src/trace_processor/importers/proto/proto_trace_parser.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/proto_trace_parser.h"
+#include "src/trace_processor/importers/proto/proto_trace_parser.h"
#include <inttypes.h>
#include <string.h>
diff --git a/src/trace_processor/proto_trace_parser.h b/src/trace_processor/importers/proto/proto_trace_parser.h
similarity index 95%
rename from src/trace_processor/proto_trace_parser.h
rename to src/trace_processor/importers/proto/proto_trace_parser.h
index 4413980..bbeb0ab 100644
--- a/src/trace_processor/proto_trace_parser.h
+++ b/src/trace_processor/importers/proto/proto_trace_parser.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_PROTO_TRACE_PARSER_H_
-#define SRC_TRACE_PROCESSOR_PROTO_TRACE_PARSER_H_
+#ifndef SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PROTO_TRACE_PARSER_H_
+#define SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PROTO_TRACE_PARSER_H_
#include <stdint.h>
@@ -121,4 +121,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_PROTO_TRACE_PARSER_H_
+#endif // SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PROTO_TRACE_PARSER_H_
diff --git a/src/trace_processor/proto_trace_parser_unittest.cc b/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc
similarity index 99%
rename from src/trace_processor/proto_trace_parser_unittest.cc
rename to src/trace_processor/importers/proto/proto_trace_parser_unittest.cc
index 1cfe4f0..2936e56 100644
--- a/src/trace_processor/proto_trace_parser_unittest.cc
+++ b/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/proto_trace_tokenizer.h"
+#include "src/trace_processor/importers/proto/proto_trace_tokenizer.h"
#include "perfetto/base/logging.h"
#include "perfetto/ext/base/string_view.h"
@@ -26,11 +26,11 @@
#include "src/trace_processor/importers/ftrace/sched_event_tracker.h"
#include "src/trace_processor/importers/proto/graphics_event_module.h"
#include "src/trace_processor/importers/proto/proto_importer_module.h"
+#include "src/trace_processor/importers/proto/proto_trace_parser.h"
#include "src/trace_processor/importers/proto/track_event_module.h"
#include "src/trace_processor/importers/systrace/systrace_parser.h"
#include "src/trace_processor/metadata.h"
#include "src/trace_processor/process_tracker.h"
-#include "src/trace_processor/proto_trace_parser.h"
#include "src/trace_processor/slice_tracker.h"
#include "src/trace_processor/stack_profile_tracker.h"
#include "src/trace_processor/trace_sorter.h"
@@ -1199,8 +1199,7 @@
Tokenize();
- EXPECT_CALL(*process_, UpdateThread(16, 15))
- .WillRepeatedly(Return(1));
+ EXPECT_CALL(*process_, UpdateThread(16, 15)).WillRepeatedly(Return(1));
TraceStorage::Thread thread(16);
thread.upid = 1u;
diff --git a/src/trace_processor/proto_trace_tokenizer.cc b/src/trace_processor/importers/proto/proto_trace_tokenizer.cc
similarity index 99%
rename from src/trace_processor/proto_trace_tokenizer.cc
rename to src/trace_processor/importers/proto/proto_trace_tokenizer.cc
index 6a98ce9..119ab03 100644
--- a/src/trace_processor/proto_trace_tokenizer.cc
+++ b/src/trace_processor/importers/proto/proto_trace_tokenizer.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/proto_trace_tokenizer.h"
+#include "src/trace_processor/importers/proto/proto_trace_tokenizer.h"
#include <string>
diff --git a/src/trace_processor/proto_trace_tokenizer.h b/src/trace_processor/importers/proto/proto_trace_tokenizer.h
similarity index 93%
rename from src/trace_processor/proto_trace_tokenizer.h
rename to src/trace_processor/importers/proto/proto_trace_tokenizer.h
index 81d0425..e86675e 100644
--- a/src/trace_processor/proto_trace_tokenizer.h
+++ b/src/trace_processor/importers/proto/proto_trace_tokenizer.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_PROTO_TRACE_TOKENIZER_H_
-#define SRC_TRACE_PROCESSOR_PROTO_TRACE_TOKENIZER_H_
+#ifndef SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PROTO_TRACE_TOKENIZER_H_
+#define SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PROTO_TRACE_TOKENIZER_H_
#include <stdint.h>
@@ -88,4 +88,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_PROTO_TRACE_TOKENIZER_H_
+#endif // SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PROTO_TRACE_TOKENIZER_H_
diff --git a/src/trace_processor/importers/proto/track_event_tokenizer.cc b/src/trace_processor/importers/proto/track_event_tokenizer.cc
index 15ba499..65c3901 100644
--- a/src/trace_processor/importers/proto/track_event_tokenizer.cc
+++ b/src/trace_processor/importers/proto/track_event_tokenizer.cc
@@ -20,8 +20,8 @@
#include "perfetto/protozero/proto_decoder.h"
#include "src/trace_processor/clock_tracker.h"
#include "src/trace_processor/importers/proto/packet_sequence_state.h"
+#include "src/trace_processor/importers/proto/proto_trace_tokenizer.h"
#include "src/trace_processor/process_tracker.h"
-#include "src/trace_processor/proto_trace_tokenizer.h"
#include "src/trace_processor/stats.h"
#include "src/trace_processor/trace_blob_view.h"
#include "src/trace_processor/trace_sorter.h"
diff --git a/src/trace_processor/trace_processor_context.cc b/src/trace_processor/trace_processor_context.cc
index b40285e..85b5f0e 100644
--- a/src/trace_processor/trace_processor_context.cc
+++ b/src/trace_processor/trace_processor_context.cc
@@ -26,10 +26,10 @@
#include "src/trace_processor/importers/ftrace/sched_event_tracker.h"
#include "src/trace_processor/importers/json/json_trace_parser.h"
#include "src/trace_processor/importers/proto/graphics_event_module.h"
+#include "src/trace_processor/importers/proto/proto_trace_parser.h"
#include "src/trace_processor/importers/proto/track_event_module.h"
#include "src/trace_processor/importers/systrace/systrace_parser.h"
#include "src/trace_processor/process_tracker.h"
-#include "src/trace_processor/proto_trace_parser.h"
#include "src/trace_processor/slice_tracker.h"
#include "src/trace_processor/stack_profile_tracker.h"
#include "src/trace_processor/syscall_tracker.h"
diff --git a/src/trace_processor/trace_processor_impl.cc b/src/trace_processor/trace_processor_impl.cc
index e094b6a..190f515 100644
--- a/src/trace_processor/trace_processor_impl.cc
+++ b/src/trace_processor/trace_processor_impl.cc
@@ -42,6 +42,7 @@
#include "src/trace_processor/importers/ftrace/sched_event_tracker.h"
#include "src/trace_processor/importers/proto/graphics_event_module.h"
#include "src/trace_processor/importers/proto/proto_importer_module.h"
+#include "src/trace_processor/importers/proto/proto_trace_tokenizer.h"
#include "src/trace_processor/importers/proto/track_event_module.h"
#include "src/trace_processor/importers/systrace/systrace_parser.h"
#include "src/trace_processor/importers/systrace/systrace_trace_parser.h"
@@ -49,7 +50,6 @@
#include "src/trace_processor/metadata_table.h"
#include "src/trace_processor/process_table.h"
#include "src/trace_processor/process_tracker.h"
-#include "src/trace_processor/proto_trace_tokenizer.h"
#include "src/trace_processor/raw_table.h"
#include "src/trace_processor/sched_slice_table.h"
#include "src/trace_processor/slice_table.h"
diff --git a/src/trace_processor/trace_sorter.cc b/src/trace_processor/trace_sorter.cc
index 6209890..49cd78e 100644
--- a/src/trace_processor/trace_sorter.cc
+++ b/src/trace_processor/trace_sorter.cc
@@ -18,7 +18,7 @@
#include <utility>
#include "perfetto/ext/base/utils.h"
-#include "src/trace_processor/proto_trace_parser.h"
+#include "src/trace_processor/importers/proto/proto_trace_parser.h"
#include "src/trace_processor/trace_sorter.h"
namespace perfetto {
diff --git a/src/trace_processor/trace_sorter_unittest.cc b/src/trace_processor/trace_sorter_unittest.cc
index da93c61..fa0a34a 100644
--- a/src/trace_processor/trace_sorter_unittest.cc
+++ b/src/trace_processor/trace_sorter_unittest.cc
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "src/trace_processor/proto_trace_parser.h"
+#include "src/trace_processor/importers/proto/proto_trace_parser.h"
#include <map>
#include <random>