trace_processor: split gfp_flags and variadic into their own folder
This allows subfolders of trace processor to depend on them without
creating circular dependencies.
Context: go/perfetto-tp-refactor
Bug: 135177627
Change-Id: I6357049ad6a675b3273f140646ca525179fd3419
diff --git a/Android.bp b/Android.bp
index 35cec9e..8b04b25 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5728,7 +5728,6 @@
name: "perfetto_src_trace_processor_lib",
srcs: [
"src/trace_processor/filtered_row_index.cc",
- "src/trace_processor/gfp_flags.cc",
"src/trace_processor/raw_table.cc",
"src/trace_processor/read_trace.cc",
"src/trace_processor/row_iterators.cc",
@@ -5854,7 +5853,6 @@
"src/trace_processor/trace_sorter.cc",
"src/trace_processor/trace_storage.cc",
"src/trace_processor/track_tracker.cc",
- "src/trace_processor/variadic.cc",
"src/trace_processor/virtual_destructors.cc",
],
}
@@ -5872,6 +5870,15 @@
],
}
+// GN: //src/trace_processor/types:types
+filegroup {
+ name: "perfetto_src_trace_processor_types_types",
+ srcs: [
+ "src/trace_processor/types/gfp_flags.cc",
+ "src/trace_processor/types/variadic.cc",
+ ],
+}
+
// GN: //src/trace_processor:unittests
filegroup {
name: "perfetto_src_trace_processor_unittests",
@@ -6642,6 +6649,7 @@
":perfetto_src_trace_processor_storage_minimal",
":perfetto_src_trace_processor_tables_tables",
":perfetto_src_trace_processor_tables_unittests",
+ ":perfetto_src_trace_processor_types_types",
":perfetto_src_trace_processor_unittests",
":perfetto_src_traced_probes_android_log_android_log",
":perfetto_src_traced_probes_android_log_unittests",
@@ -6856,6 +6864,7 @@
":perfetto_src_trace_processor_storage_full",
":perfetto_src_trace_processor_storage_minimal",
":perfetto_src_trace_processor_tables_tables",
+ ":perfetto_src_trace_processor_types_types",
"src/trace_processor/proto_to_json.cc",
"src/trace_processor/trace_processor_shell.cc",
],
@@ -6965,6 +6974,7 @@
":perfetto_src_trace_processor_storage_full",
":perfetto_src_trace_processor_storage_minimal",
":perfetto_src_trace_processor_tables_tables",
+ ":perfetto_src_trace_processor_types_types",
":perfetto_tools_trace_to_text_common",
":perfetto_tools_trace_to_text_full",
":perfetto_tools_trace_to_text_pprofbuilder",
diff --git a/BUILD b/BUILD
index 4ee218d..0a41965 100644
--- a/BUILD
+++ b/BUILD
@@ -763,6 +763,17 @@
],
)
+# GN target: //src/trace_processor/types:types
+filegroup(
+ name = "src_trace_processor_types_types",
+ srcs = [
+ "src/trace_processor/types/gfp_flags.cc",
+ "src/trace_processor/types/gfp_flags.h",
+ "src/trace_processor/types/variadic.cc",
+ "src/trace_processor/types/variadic.h",
+ ],
+)
+
# GN target: //src/trace_processor:descriptors
filegroup(
name = "src_trace_processor_descriptors",
@@ -787,8 +798,6 @@
srcs = [
"src/trace_processor/filtered_row_index.cc",
"src/trace_processor/filtered_row_index.h",
- "src/trace_processor/gfp_flags.cc",
- "src/trace_processor/gfp_flags.h",
"src/trace_processor/raw_table.cc",
"src/trace_processor/raw_table.h",
"src/trace_processor/read_trace.cc",
@@ -950,8 +959,6 @@
"src/trace_processor/trace_storage.h",
"src/trace_processor/track_tracker.cc",
"src/trace_processor/track_tracker.h",
- "src/trace_processor/variadic.cc",
- "src/trace_processor/variadic.h",
"src/trace_processor/virtual_destructors.cc",
],
)
@@ -2571,6 +2578,7 @@
":src_trace_processor_storage_full",
":src_trace_processor_storage_minimal",
":src_trace_processor_tables_tables",
+ ":src_trace_processor_types_types",
],
hdrs = [
":include_perfetto_base_base",
@@ -2654,6 +2662,7 @@
":src_trace_processor_storage_full",
":src_trace_processor_storage_minimal",
":src_trace_processor_tables_tables",
+ ":src_trace_processor_types_types",
],
visibility = [
"//visibility:public",
@@ -2809,6 +2818,7 @@
":src_trace_processor_storage_full",
":src_trace_processor_storage_minimal",
":src_trace_processor_tables_tables",
+ ":src_trace_processor_types_types",
":tools_trace_to_text_common",
":tools_trace_to_text_full",
":tools_trace_to_text_pprofbuilder",
diff --git a/src/trace_processor/BUILD.gn b/src/trace_processor/BUILD.gn
index c372946..75571e6 100644
--- a/src/trace_processor/BUILD.gn
+++ b/src/trace_processor/BUILD.gn
@@ -138,8 +138,6 @@
"trace_storage.h",
"track_tracker.cc",
"track_tracker.h",
- "variadic.cc",
- "variadic.h",
"virtual_destructors.cc",
]
@@ -151,6 +149,7 @@
"../protozero",
"containers",
"tables",
+ "types",
]
public_deps = [
"../../include/perfetto/trace_processor:storage",
@@ -253,6 +252,7 @@
"../../protos/perfetto/trace/gpu:zero",
"../../protos/perfetto/trace/interned_data:zero",
"../protozero",
+ "types",
]
if (enable_perfetto_trace_processor_json) {
public_deps += [ "../../gn:jsoncpp" ]
@@ -287,8 +287,6 @@
sources = [
"filtered_row_index.cc",
"filtered_row_index.h",
- "gfp_flags.cc",
- "gfp_flags.h",
"raw_table.cc",
"raw_table.h",
"read_trace.cc",
@@ -327,6 +325,7 @@
"metrics:lib",
"sqlite",
"tables",
+ "types",
]
public_deps = [
"../../include/perfetto/trace_processor",
diff --git a/src/trace_processor/args_tracker.h b/src/trace_processor/args_tracker.h
index 3eebcb8..2c6c8c4 100644
--- a/src/trace_processor/args_tracker.h
+++ b/src/trace_processor/args_tracker.h
@@ -20,7 +20,7 @@
#include "src/trace_processor/global_args_tracker.h"
#include "src/trace_processor/trace_processor_context.h"
#include "src/trace_processor/trace_storage.h"
-#include "src/trace_processor/variadic.h"
+#include "src/trace_processor/types/variadic.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/event_tracker.cc b/src/trace_processor/event_tracker.cc
index b276142..cd7c9e4 100644
--- a/src/trace_processor/event_tracker.cc
+++ b/src/trace_processor/event_tracker.cc
@@ -25,7 +25,7 @@
#include "src/trace_processor/stats.h"
#include "src/trace_processor/trace_processor_context.h"
#include "src/trace_processor/track_tracker.h"
-#include "src/trace_processor/variadic.h"
+#include "src/trace_processor/types/variadic.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/global_args_tracker.h b/src/trace_processor/global_args_tracker.h
index 92784e1..a368954 100644
--- a/src/trace_processor/global_args_tracker.h
+++ b/src/trace_processor/global_args_tracker.h
@@ -19,7 +19,7 @@
#include "src/trace_processor/trace_processor_context.h"
#include "src/trace_processor/trace_storage.h"
-#include "src/trace_processor/variadic.h"
+#include "src/trace_processor/types/variadic.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/importers/ftrace/sched_event_tracker.cc b/src/trace_processor/importers/ftrace/sched_event_tracker.cc
index 7abda8c..052f051 100644
--- a/src/trace_processor/importers/ftrace/sched_event_tracker.cc
+++ b/src/trace_processor/importers/ftrace/sched_event_tracker.cc
@@ -26,7 +26,7 @@
#include "src/trace_processor/process_tracker.h"
#include "src/trace_processor/stats.h"
#include "src/trace_processor/trace_processor_context.h"
-#include "src/trace_processor/variadic.h"
+#include "src/trace_processor/types/variadic.h"
#include "protos/perfetto/trace/ftrace/ftrace_event.pbzero.h"
#include "protos/perfetto/trace/ftrace/sched.pbzero.h"
diff --git a/src/trace_processor/importers/proto/proto_trace_parser.cc b/src/trace_processor/importers/proto/proto_trace_parser.cc
index 08d0a98..e27bdcb 100644
--- a/src/trace_processor/importers/proto/proto_trace_parser.cc
+++ b/src/trace_processor/importers/proto/proto_trace_parser.cc
@@ -43,7 +43,7 @@
#include "src/trace_processor/timestamped_trace_piece.h"
#include "src/trace_processor/trace_processor_context.h"
#include "src/trace_processor/track_tracker.h"
-#include "src/trace_processor/variadic.h"
+#include "src/trace_processor/types/variadic.h"
#include "protos/perfetto/common/trace_stats.pbzero.h"
#include "protos/perfetto/config/trace_config.pbzero.h"
diff --git a/src/trace_processor/metadata.h b/src/trace_processor/metadata.h
index 3b97259..eb55e15 100644
--- a/src/trace_processor/metadata.h
+++ b/src/trace_processor/metadata.h
@@ -20,7 +20,7 @@
#include <stddef.h>
#include "src/trace_processor/containers/string_pool.h"
-#include "src/trace_processor/variadic.h"
+#include "src/trace_processor/types/variadic.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/raw_table.cc b/src/trace_processor/raw_table.cc
index ac884af..9fd262a 100644
--- a/src/trace_processor/raw_table.cc
+++ b/src/trace_processor/raw_table.cc
@@ -20,9 +20,9 @@
#include "perfetto/base/compiler.h"
#include "perfetto/ext/base/string_utils.h"
-#include "src/trace_processor/gfp_flags.h"
#include "src/trace_processor/sqlite/sqlite_utils.h"
-#include "src/trace_processor/variadic.h"
+#include "src/trace_processor/types/gfp_flags.h"
+#include "src/trace_processor/types/variadic.h"
#include "protos/perfetto/trace/ftrace/binder.pbzero.h"
#include "protos/perfetto/trace/ftrace/clk.pbzero.h"
diff --git a/src/trace_processor/trace_processor_impl.cc b/src/trace_processor/trace_processor_impl.cc
index 647e74d..b523190 100644
--- a/src/trace_processor/trace_processor_impl.cc
+++ b/src/trace_processor/trace_processor_impl.cc
@@ -34,7 +34,7 @@
#include "src/trace_processor/sqlite/sqlite3_str_split.h"
#include "src/trace_processor/sqlite/sqlite_table.h"
#include "src/trace_processor/stats_table.h"
-#include "src/trace_processor/variadic.h"
+#include "src/trace_processor/types/variadic.h"
#include "src/trace_processor/window_operator_table.h"
#include "src/trace_processor/metrics/metrics.descriptor.h"
diff --git a/src/trace_processor/trace_storage.h b/src/trace_processor/trace_storage.h
index 868ff44..5299168 100644
--- a/src/trace_processor/trace_storage.h
+++ b/src/trace_processor/trace_storage.h
@@ -42,7 +42,7 @@
#include "src/trace_processor/tables/profiler_tables.h"
#include "src/trace_processor/tables/slice_tables.h"
#include "src/trace_processor/tables/track_tables.h"
-#include "src/trace_processor/variadic.h"
+#include "src/trace_processor/types/variadic.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/types/BUILD.gn b/src/trace_processor/types/BUILD.gn
new file mode 100644
index 0000000..b86ba23
--- /dev/null
+++ b/src/trace_processor/types/BUILD.gn
@@ -0,0 +1,27 @@
+# Copyright (C) 2020 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("types") {
+ sources = [
+ "gfp_flags.cc",
+ "gfp_flags.h",
+ "variadic.cc",
+ "variadic.h",
+ ]
+ deps = [
+ "../../../gn:default_deps",
+ "../../../include/perfetto/ext/base",
+ "../containers",
+ ]
+}
diff --git a/src/trace_processor/gfp_flags.cc b/src/trace_processor/types/gfp_flags.cc
similarity index 99%
rename from src/trace_processor/gfp_flags.cc
rename to src/trace_processor/types/gfp_flags.cc
index 2d5b587..74f7511 100644
--- a/src/trace_processor/gfp_flags.cc
+++ b/src/trace_processor/types/gfp_flags.cc
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#include "src/trace_processor/gfp_flags.h"
+#include "src/trace_processor/types/gfp_flags.h"
+
#include <array>
namespace perfetto {
diff --git a/src/trace_processor/gfp_flags.h b/src/trace_processor/types/gfp_flags.h
similarity index 88%
rename from src/trace_processor/gfp_flags.h
rename to src/trace_processor/types/gfp_flags.h
index 9d4cd7d..837b284 100644
--- a/src/trace_processor/gfp_flags.h
+++ b/src/trace_processor/types/gfp_flags.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_GFP_FLAGS_H_
-#define SRC_TRACE_PROCESSOR_GFP_FLAGS_H_
+#ifndef SRC_TRACE_PROCESSOR_TYPES_GFP_FLAGS_H_
+#define SRC_TRACE_PROCESSOR_TYPES_GFP_FLAGS_H_
#include <tuple>
#include "perfetto/ext/base/string_writer.h"
@@ -33,4 +33,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_GFP_FLAGS_H_
+#endif // SRC_TRACE_PROCESSOR_TYPES_GFP_FLAGS_H_
diff --git a/src/trace_processor/variadic.cc b/src/trace_processor/types/variadic.cc
similarity index 93%
rename from src/trace_processor/variadic.cc
rename to src/trace_processor/types/variadic.cc
index edfde74..837bfeb 100644
--- a/src/trace_processor/variadic.cc
+++ b/src/trace_processor/types/variadic.cc
@@ -1,4 +1,4 @@
-/*
+#/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/variadic.h"
+#include "src/trace_processor/types/variadic.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/variadic.h b/src/trace_processor/types/variadic.h
similarity index 96%
rename from src/trace_processor/variadic.h
rename to src/trace_processor/types/variadic.h
index 58aa935..7a929e5 100644
--- a/src/trace_processor/variadic.h
+++ b/src/trace_processor/types/variadic.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_VARIADIC_H_
-#define SRC_TRACE_PROCESSOR_VARIADIC_H_
+#ifndef SRC_TRACE_PROCESSOR_TYPES_VARIADIC_H_
+#define SRC_TRACE_PROCESSOR_TYPES_VARIADIC_H_
#include "src/trace_processor/containers/string_pool.h"
@@ -133,4 +133,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_VARIADIC_H_
+#endif // SRC_TRACE_PROCESSOR_TYPES_VARIADIC_H_
