tp: move module code to importers
Change-Id: I4062aaf3bfc7eab7f478e86140c6072b177e99db
diff --git a/Android.bp b/Android.bp
index 68c2708..e4f81f6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6542,7 +6542,7 @@
filegroup {
name: "perfetto_src_trace_processor_storage_full",
srcs: [
- "src/trace_processor/additional_modules.cc",
+ "src/trace_processor/importers/additional_modules.cc",
"src/trace_processor/importers/ftrace/binder_tracker.cc",
"src/trace_processor/importers/ftrace/ftrace_module_impl.cc",
"src/trace_processor/importers/ftrace/ftrace_parser.cc",
@@ -6580,8 +6580,8 @@
filegroup {
name: "perfetto_src_trace_processor_storage_minimal",
srcs: [
- "src/trace_processor/default_modules.cc",
"src/trace_processor/forwarding_trace_parser.cc",
+ "src/trace_processor/importers/default_modules.cc",
"src/trace_processor/importers/ftrace/ftrace_module.cc",
"src/trace_processor/importers/gzip/gzip_utils.cc",
"src/trace_processor/importers/json/json_utils.cc",
diff --git a/BUILD b/BUILD
index e0d45cc..dc97458 100644
--- a/BUILD
+++ b/BUILD
@@ -932,8 +932,8 @@
filegroup(
name = "src_trace_processor_storage_full",
srcs = [
- "src/trace_processor/additional_modules.cc",
- "src/trace_processor/additional_modules.h",
+ "src/trace_processor/importers/additional_modules.cc",
+ "src/trace_processor/importers/additional_modules.h",
"src/trace_processor/importers/ftrace/binder_tracker.cc",
"src/trace_processor/importers/ftrace/binder_tracker.h",
"src/trace_processor/importers/ftrace/ftrace_module_impl.cc",
@@ -1004,10 +1004,10 @@
name = "src_trace_processor_storage_minimal",
srcs = [
"src/trace_processor/chunked_trace_reader.h",
- "src/trace_processor/default_modules.cc",
- "src/trace_processor/default_modules.h",
"src/trace_processor/forwarding_trace_parser.cc",
"src/trace_processor/forwarding_trace_parser.h",
+ "src/trace_processor/importers/default_modules.cc",
+ "src/trace_processor/importers/default_modules.h",
"src/trace_processor/importers/ftrace/ftrace_module.cc",
"src/trace_processor/importers/ftrace/ftrace_module.h",
"src/trace_processor/importers/fuchsia/fuchsia_record.h",
diff --git a/src/trace_processor/BUILD.gn b/src/trace_processor/BUILD.gn
index 10a4a4f..77a358b 100644
--- a/src/trace_processor/BUILD.gn
+++ b/src/trace_processor/BUILD.gn
@@ -61,10 +61,10 @@
source_set("storage_minimal") {
sources = [
"chunked_trace_reader.h",
- "default_modules.cc",
- "default_modules.h",
"forwarding_trace_parser.cc",
"forwarding_trace_parser.h",
+ "importers/default_modules.cc",
+ "importers/default_modules.h",
"importers/ftrace/ftrace_module.cc",
"importers/ftrace/ftrace_module.h",
"importers/fuchsia/fuchsia_record.h",
@@ -160,8 +160,8 @@
source_set("storage_full") {
sources = [
- "additional_modules.cc",
- "additional_modules.h",
+ "importers/additional_modules.cc",
+ "importers/additional_modules.h",
"importers/ftrace/binder_tracker.cc",
"importers/ftrace/binder_tracker.h",
"importers/ftrace/ftrace_module_impl.cc",
diff --git a/src/trace_processor/additional_modules.cc b/src/trace_processor/importers/additional_modules.cc
similarity index 96%
rename from src/trace_processor/additional_modules.cc
rename to src/trace_processor/importers/additional_modules.cc
index 2b65ea1..1627893 100644
--- a/src/trace_processor/additional_modules.cc
+++ b/src/trace_processor/importers/additional_modules.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/additional_modules.h"
+#include "src/trace_processor/importers/additional_modules.h"
#include "src/trace_processor/importers/ftrace/ftrace_module_impl.h"
#include "src/trace_processor/importers/proto/android_probes_module.h"
#include "src/trace_processor/importers/proto/graphics_event_module.h"
diff --git a/src/trace_processor/additional_modules.h b/src/trace_processor/importers/additional_modules.h
similarity index 82%
rename from src/trace_processor/additional_modules.h
rename to src/trace_processor/importers/additional_modules.h
index 3228494..8040b64 100644
--- a/src/trace_processor/additional_modules.h
+++ b/src/trace_processor/importers/additional_modules.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_ADDITIONAL_MODULES_H_
-#define SRC_TRACE_PROCESSOR_ADDITIONAL_MODULES_H_
+#ifndef SRC_TRACE_PROCESSOR_IMPORTERS_ADDITIONAL_MODULES_H_
+#define SRC_TRACE_PROCESSOR_IMPORTERS_ADDITIONAL_MODULES_H_
#include "src/trace_processor/types/trace_processor_context.h"
@@ -27,4 +27,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_ADDITIONAL_MODULES_H_
+#endif // SRC_TRACE_PROCESSOR_IMPORTERS_ADDITIONAL_MODULES_H_
diff --git a/src/trace_processor/default_modules.cc b/src/trace_processor/importers/default_modules.cc
similarity index 95%
rename from src/trace_processor/default_modules.cc
rename to src/trace_processor/importers/default_modules.cc
index 3a28c7a..2704478 100644
--- a/src/trace_processor/default_modules.cc
+++ b/src/trace_processor/importers/default_modules.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/default_modules.h"
+#include "src/trace_processor/importers/default_modules.h"
#include "src/trace_processor/importers/ftrace/ftrace_module.h"
#include "src/trace_processor/importers/proto/profile_module.h"
#include "src/trace_processor/importers/proto/proto_importer_module.h"
diff --git a/src/trace_processor/default_modules.h b/src/trace_processor/importers/default_modules.h
similarity index 82%
rename from src/trace_processor/default_modules.h
rename to src/trace_processor/importers/default_modules.h
index a524c43..f1dcbf2 100644
--- a/src/trace_processor/default_modules.h
+++ b/src/trace_processor/importers/default_modules.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_DEFAULT_MODULES_H_
-#define SRC_TRACE_PROCESSOR_DEFAULT_MODULES_H_
+#ifndef SRC_TRACE_PROCESSOR_IMPORTERS_DEFAULT_MODULES_H_
+#define SRC_TRACE_PROCESSOR_IMPORTERS_DEFAULT_MODULES_H_
#include "src/trace_processor/types/trace_processor_context.h"
@@ -27,4 +27,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_DEFAULT_MODULES_H_
+#endif // SRC_TRACE_PROCESSOR_IMPORTERS_DEFAULT_MODULES_H_
diff --git a/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc b/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc
index f0222eb..9324bf2 100644
--- a/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc
+++ b/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc
@@ -19,14 +19,14 @@
#include "perfetto/base/logging.h"
#include "perfetto/ext/base/string_view.h"
#include "perfetto/protozero/scattered_heap_buffer.h"
-#include "src/trace_processor/additional_modules.h"
-#include "src/trace_processor/default_modules.h"
+#include "src/trace_processor/importers/additional_modules.h"
#include "src/trace_processor/importers/common/args_tracker.h"
#include "src/trace_processor/importers/common/clock_tracker.h"
#include "src/trace_processor/importers/common/event_tracker.h"
#include "src/trace_processor/importers/common/process_tracker.h"
#include "src/trace_processor/importers/common/slice_tracker.h"
#include "src/trace_processor/importers/common/track_tracker.h"
+#include "src/trace_processor/importers/default_modules.h"
#include "src/trace_processor/importers/ftrace/sched_event_tracker.h"
#include "src/trace_processor/importers/proto/metadata_tracker.h"
#include "src/trace_processor/importers/proto/proto_trace_parser.h"
diff --git a/src/trace_processor/trace_processor_impl.cc b/src/trace_processor/trace_processor_impl.cc
index 8df1822..d05596e 100644
--- a/src/trace_processor/trace_processor_impl.cc
+++ b/src/trace_processor/trace_processor_impl.cc
@@ -23,11 +23,11 @@
#include "perfetto/base/time.h"
#include "perfetto/ext/base/string_splitter.h"
#include "perfetto/ext/base/string_utils.h"
-#include "src/trace_processor/additional_modules.h"
#include "src/trace_processor/dynamic/describe_slice_generator.h"
#include "src/trace_processor/dynamic/experimental_counter_dur_generator.h"
#include "src/trace_processor/dynamic/experimental_flamegraph_generator.h"
#include "src/trace_processor/export_json.h"
+#include "src/trace_processor/importers/additional_modules.h"
#include "src/trace_processor/importers/ftrace/sched_event_tracker.h"
#include "src/trace_processor/importers/fuchsia/fuchsia_trace_parser.h"
#include "src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.h"
diff --git a/src/trace_processor/trace_processor_storage_impl.cc b/src/trace_processor/trace_processor_storage_impl.cc
index 3a2b903..5276196 100644
--- a/src/trace_processor/trace_processor_storage_impl.cc
+++ b/src/trace_processor/trace_processor_storage_impl.cc
@@ -17,7 +17,6 @@
#include "src/trace_processor/trace_processor_storage_impl.h"
#include "perfetto/base/logging.h"
-#include "src/trace_processor/default_modules.h"
#include "src/trace_processor/forwarding_trace_parser.h"
#include "src/trace_processor/importers/common/args_tracker.h"
#include "src/trace_processor/importers/common/clock_tracker.h"
@@ -25,6 +24,7 @@
#include "src/trace_processor/importers/common/process_tracker.h"
#include "src/trace_processor/importers/common/slice_tracker.h"
#include "src/trace_processor/importers/common/track_tracker.h"
+#include "src/trace_processor/importers/default_modules.h"
#include "src/trace_processor/importers/proto/heap_profile_tracker.h"
#include "src/trace_processor/importers/proto/metadata_tracker.h"
#include "src/trace_processor/importers/proto/perf_sample_tracker.h"