tp: move remaining custom sqlite tables to sqlite/
Change-Id: I393ce5e52a7dadd5889e47433a91ed6ccfcbb228
diff --git a/Android.bp b/Android.bp
index 82c5f53..00fe8f7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6456,6 +6456,14 @@
],
}
+// GN: //src/trace_processor:ftrace_descriptors
+filegroup {
+ name: "perfetto_src_trace_processor_ftrace_descriptors",
+ srcs: [
+ "src/trace_processor/importers/ftrace/ftrace_descriptors.cc",
+ ],
+}
+
// GN: //src/trace_processor:lib
filegroup {
name: "perfetto_src_trace_processor_lib",
@@ -6464,9 +6472,6 @@
"src/trace_processor/dynamic/experimental_counter_dur_generator.cc",
"src/trace_processor/dynamic/experimental_flamegraph_generator.cc",
"src/trace_processor/read_trace.cc",
- "src/trace_processor/sql_stats_table.cc",
- "src/trace_processor/sqlite_raw_table.cc",
- "src/trace_processor/stats_table.cc",
"src/trace_processor/trace_processor.cc",
"src/trace_processor/trace_processor_impl.cc",
],
@@ -6503,8 +6508,11 @@
"src/trace_processor/sqlite/db_sqlite_table.cc",
"src/trace_processor/sqlite/query_constraints.cc",
"src/trace_processor/sqlite/span_join_operator_table.cc",
+ "src/trace_processor/sqlite/sql_stats_table.cc",
"src/trace_processor/sqlite/sqlite3_str_split.cc",
+ "src/trace_processor/sqlite/sqlite_raw_table.cc",
"src/trace_processor/sqlite/sqlite_table.cc",
+ "src/trace_processor/sqlite/stats_table.cc",
"src/trace_processor/sqlite/window_operator_table.cc",
],
}
@@ -6526,7 +6534,6 @@
srcs: [
"src/trace_processor/additional_modules.cc",
"src/trace_processor/importers/ftrace/binder_tracker.cc",
- "src/trace_processor/importers/ftrace/ftrace_descriptors.cc",
"src/trace_processor/importers/ftrace/ftrace_module_impl.cc",
"src/trace_processor/importers/ftrace/ftrace_parser.cc",
"src/trace_processor/importers/ftrace/ftrace_tokenizer.cc",
@@ -7535,6 +7542,7 @@
":perfetto_src_trace_processor_db_unittests",
":perfetto_src_trace_processor_descriptors",
":perfetto_src_trace_processor_export_json",
+ ":perfetto_src_trace_processor_ftrace_descriptors",
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metrics_lib",
":perfetto_src_trace_processor_metrics_unittests",
@@ -7783,6 +7791,7 @@
":perfetto_src_trace_processor_db_lib",
":perfetto_src_trace_processor_descriptors",
":perfetto_src_trace_processor_export_json",
+ ":perfetto_src_trace_processor_ftrace_descriptors",
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metrics_lib",
":perfetto_src_trace_processor_sqlite_sqlite",
@@ -7897,6 +7906,7 @@
":perfetto_src_trace_processor_db_lib",
":perfetto_src_trace_processor_descriptors",
":perfetto_src_trace_processor_export_json",
+ ":perfetto_src_trace_processor_ftrace_descriptors",
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metrics_lib",
":perfetto_src_trace_processor_sqlite_sqlite",
diff --git a/BUILD b/BUILD
index e138424..d143300 100644
--- a/BUILD
+++ b/BUILD
@@ -796,11 +796,17 @@
"src/trace_processor/sqlite/scoped_db.h",
"src/trace_processor/sqlite/span_join_operator_table.cc",
"src/trace_processor/sqlite/span_join_operator_table.h",
+ "src/trace_processor/sqlite/sql_stats_table.cc",
+ "src/trace_processor/sqlite/sql_stats_table.h",
"src/trace_processor/sqlite/sqlite3_str_split.cc",
"src/trace_processor/sqlite/sqlite3_str_split.h",
+ "src/trace_processor/sqlite/sqlite_raw_table.cc",
+ "src/trace_processor/sqlite/sqlite_raw_table.h",
"src/trace_processor/sqlite/sqlite_table.cc",
"src/trace_processor/sqlite/sqlite_table.h",
"src/trace_processor/sqlite/sqlite_utils.h",
+ "src/trace_processor/sqlite/stats_table.cc",
+ "src/trace_processor/sqlite/stats_table.h",
"src/trace_processor/sqlite/window_operator_table.cc",
"src/trace_processor/sqlite/window_operator_table.h",
],
@@ -867,6 +873,15 @@
],
)
+# GN target: //src/trace_processor:ftrace_descriptors
+filegroup(
+ name = "src_trace_processor_ftrace_descriptors",
+ srcs = [
+ "src/trace_processor/importers/ftrace/ftrace_descriptors.cc",
+ "src/trace_processor/importers/ftrace/ftrace_descriptors.h",
+ ],
+)
+
# GN target: //src/trace_processor:lib
filegroup(
name = "src_trace_processor_lib",
@@ -878,12 +893,6 @@
"src/trace_processor/dynamic/experimental_flamegraph_generator.cc",
"src/trace_processor/dynamic/experimental_flamegraph_generator.h",
"src/trace_processor/read_trace.cc",
- "src/trace_processor/sql_stats_table.cc",
- "src/trace_processor/sql_stats_table.h",
- "src/trace_processor/sqlite_raw_table.cc",
- "src/trace_processor/sqlite_raw_table.h",
- "src/trace_processor/stats_table.cc",
- "src/trace_processor/stats_table.h",
"src/trace_processor/trace_processor.cc",
"src/trace_processor/trace_processor_impl.cc",
"src/trace_processor/trace_processor_impl.h",
@@ -898,8 +907,6 @@
"src/trace_processor/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_descriptors.cc",
- "src/trace_processor/importers/ftrace/ftrace_descriptors.h",
"src/trace_processor/importers/ftrace/ftrace_module_impl.cc",
"src/trace_processor/importers/ftrace/ftrace_module_impl.h",
"src/trace_processor/importers/ftrace/ftrace_parser.cc",
@@ -2811,6 +2818,7 @@
":src_trace_processor_db_lib",
":src_trace_processor_descriptors",
":src_trace_processor_export_json",
+ ":src_trace_processor_ftrace_descriptors",
":src_trace_processor_lib",
":src_trace_processor_metrics_lib",
":src_trace_processor_sqlite_sqlite",
@@ -2898,6 +2906,7 @@
":src_trace_processor_db_lib",
":src_trace_processor_descriptors",
":src_trace_processor_export_json",
+ ":src_trace_processor_ftrace_descriptors",
":src_trace_processor_lib",
":src_trace_processor_metrics_lib",
":src_trace_processor_rpc_httpd",
@@ -3063,6 +3072,7 @@
":src_trace_processor_db_lib",
":src_trace_processor_descriptors",
":src_trace_processor_export_json",
+ ":src_trace_processor_ftrace_descriptors",
":src_trace_processor_lib",
":src_trace_processor_metrics_lib",
":src_trace_processor_sqlite_sqlite",
diff --git a/src/trace_processor/BUILD.gn b/src/trace_processor/BUILD.gn
index 9e2ddf2..4512f42 100644
--- a/src/trace_processor/BUILD.gn
+++ b/src/trace_processor/BUILD.gn
@@ -46,6 +46,18 @@
sources = [ "importers/proto/track_event.descriptor.h" ]
}
+source_set("ftrace_descriptors") {
+ sources = [
+ "importers/ftrace/ftrace_descriptors.cc",
+ "importers/ftrace/ftrace_descriptors.h",
+ ]
+ deps = [
+ "../../gn:default_deps",
+ "../../include/perfetto/ext/base:base",
+ "../protozero",
+ ]
+}
+
source_set("protozero_to_text") {
sources = [
"protozero_to_text.cc",
@@ -58,7 +70,7 @@
"../../protos/perfetto/common:zero",
"../../protos/perfetto/trace/track_event:zero",
"../base",
- "../protozero:protozero",
+ "../protozero",
]
}
@@ -72,7 +84,7 @@
"../../include/perfetto/trace_processor",
"../../protos/perfetto/common:zero",
"../base",
- "../protozero:protozero",
+ "../protozero",
]
}
@@ -195,8 +207,6 @@
"additional_modules.h",
"importers/ftrace/binder_tracker.cc",
"importers/ftrace/binder_tracker.h",
- "importers/ftrace/ftrace_descriptors.cc",
- "importers/ftrace/ftrace_descriptors.h",
"importers/ftrace/ftrace_module_impl.cc",
"importers/ftrace/ftrace_module_impl.h",
"importers/ftrace/ftrace_parser.cc",
@@ -260,6 +270,7 @@
]
public_deps = [ ":storage_minimal" ]
deps = [
+ ":ftrace_descriptors",
"../../include/perfetto/ext/base:base",
"../../include/perfetto/ext/traced:sys_stats_counters",
"../../protos/perfetto/common:zero",
@@ -304,12 +315,6 @@
"dynamic/experimental_flamegraph_generator.cc",
"dynamic/experimental_flamegraph_generator.h",
"read_trace.cc",
- "sql_stats_table.cc",
- "sql_stats_table.h",
- "sqlite_raw_table.cc",
- "sqlite_raw_table.h",
- "stats_table.cc",
- "stats_table.h",
"trace_processor.cc",
"trace_processor_impl.cc",
"trace_processor_impl.h",
diff --git a/src/trace_processor/sqlite/BUILD.gn b/src/trace_processor/sqlite/BUILD.gn
index 30d6e81..1679172 100644
--- a/src/trace_processor/sqlite/BUILD.gn
+++ b/src/trace_processor/sqlite/BUILD.gn
@@ -25,21 +25,29 @@
"scoped_db.h",
"span_join_operator_table.cc",
"span_join_operator_table.h",
+ "sql_stats_table.cc",
+ "sql_stats_table.h",
"sqlite3_str_split.cc",
"sqlite3_str_split.h",
+ "sqlite_raw_table.cc",
+ "sqlite_raw_table.h",
"sqlite_table.cc",
"sqlite_table.h",
"sqlite_utils.h",
+ "stats_table.cc",
+ "stats_table.h",
"window_operator_table.cc",
"window_operator_table.h",
]
deps = [
+ "..:ftrace_descriptors",
"../../../gn:default_deps",
"../../../gn:sqlite",
"../../../include/perfetto/trace_processor",
"../../../protos/perfetto/trace/ftrace:zero",
"../../base",
"../db:lib",
+ "../storage",
"../types",
]
}
diff --git a/src/trace_processor/sql_stats_table.cc b/src/trace_processor/sqlite/sql_stats_table.cc
similarity index 98%
rename from src/trace_processor/sql_stats_table.cc
rename to src/trace_processor/sqlite/sql_stats_table.cc
index 0914bb3..b9fb2db 100644
--- a/src/trace_processor/sql_stats_table.cc
+++ b/src/trace_processor/sqlite/sql_stats_table.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/sql_stats_table.h"
+#include "src/trace_processor/sqlite/sql_stats_table.h"
#include <sqlite3.h>
diff --git a/src/trace_processor/sql_stats_table.h b/src/trace_processor/sqlite/sql_stats_table.h
similarity index 93%
rename from src/trace_processor/sql_stats_table.h
rename to src/trace_processor/sqlite/sql_stats_table.h
index 7793f2e..c146ee8 100644
--- a/src/trace_processor/sql_stats_table.h
+++ b/src/trace_processor/sqlite/sql_stats_table.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_SQL_STATS_TABLE_H_
-#define SRC_TRACE_PROCESSOR_SQL_STATS_TABLE_H_
+#ifndef SRC_TRACE_PROCESSOR_SQLITE_SQL_STATS_TABLE_H_
+#define SRC_TRACE_PROCESSOR_SQLITE_SQL_STATS_TABLE_H_
#include <limits>
#include <memory>
@@ -83,4 +83,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_SQL_STATS_TABLE_H_
+#endif // SRC_TRACE_PROCESSOR_SQLITE_SQL_STATS_TABLE_H_
diff --git a/src/trace_processor/sqlite_raw_table.cc b/src/trace_processor/sqlite/sqlite_raw_table.cc
similarity index 99%
rename from src/trace_processor/sqlite_raw_table.cc
rename to src/trace_processor/sqlite/sqlite_raw_table.cc
index f35420a..ee7d33e 100644
--- a/src/trace_processor/sqlite_raw_table.cc
+++ b/src/trace_processor/sqlite/sqlite_raw_table.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/sqlite_raw_table.h"
+#include "src/trace_processor/sqlite/sqlite_raw_table.h"
#include <inttypes.h>
diff --git a/src/trace_processor/sqlite_raw_table.h b/src/trace_processor/sqlite/sqlite_raw_table.h
similarity index 91%
rename from src/trace_processor/sqlite_raw_table.h
rename to src/trace_processor/sqlite/sqlite_raw_table.h
index 420a4d4..4c8190e 100644
--- a/src/trace_processor/sqlite_raw_table.h
+++ b/src/trace_processor/sqlite/sqlite_raw_table.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_SQLITE_RAW_TABLE_H_
-#define SRC_TRACE_PROCESSOR_SQLITE_RAW_TABLE_H_
+#ifndef SRC_TRACE_PROCESSOR_SQLITE_SQLITE_RAW_TABLE_H_
+#define SRC_TRACE_PROCESSOR_SQLITE_SQLITE_RAW_TABLE_H_
#include "perfetto/base/logging.h"
#include "perfetto/ext/base/string_writer.h"
@@ -64,4 +64,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_SQLITE_RAW_TABLE_H_
+#endif // SRC_TRACE_PROCESSOR_SQLITE_SQLITE_RAW_TABLE_H_
diff --git a/src/trace_processor/stats_table.cc b/src/trace_processor/sqlite/stats_table.cc
similarity index 98%
rename from src/trace_processor/stats_table.cc
rename to src/trace_processor/sqlite/stats_table.cc
index ab4599a..de536a5 100644
--- a/src/trace_processor/stats_table.cc
+++ b/src/trace_processor/sqlite/stats_table.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/stats_table.h"
+#include "src/trace_processor/sqlite/stats_table.h"
#include "src/trace_processor/sqlite/sqlite_utils.h"
diff --git a/src/trace_processor/stats_table.h b/src/trace_processor/sqlite/stats_table.h
similarity index 93%
rename from src/trace_processor/stats_table.h
rename to src/trace_processor/sqlite/stats_table.h
index a97dc9f..6ef8c20 100644
--- a/src/trace_processor/stats_table.h
+++ b/src/trace_processor/sqlite/stats_table.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_STATS_TABLE_H_
-#define SRC_TRACE_PROCESSOR_STATS_TABLE_H_
+#ifndef SRC_TRACE_PROCESSOR_SQLITE_STATS_TABLE_H_
+#define SRC_TRACE_PROCESSOR_SQLITE_STATS_TABLE_H_
#include <limits>
#include <memory>
@@ -73,4 +73,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_STATS_TABLE_H_
+#endif // SRC_TRACE_PROCESSOR_SQLITE_STATS_TABLE_H_
diff --git a/src/trace_processor/trace_processor_impl.cc b/src/trace_processor/trace_processor_impl.cc
index 8398efb..12c9398 100644
--- a/src/trace_processor/trace_processor_impl.cc
+++ b/src/trace_processor/trace_processor_impl.cc
@@ -36,14 +36,14 @@
#include "src/trace_processor/importers/json/json_trace_tokenizer.h"
#include "src/trace_processor/importers/systrace/systrace_trace_parser.h"
#include "src/trace_processor/metadata_tracker.h"
-#include "src/trace_processor/sql_stats_table.h"
#include "src/trace_processor/sqlite/span_join_operator_table.h"
+#include "src/trace_processor/sqlite/sql_stats_table.h"
#include "src/trace_processor/sqlite/sqlite3_str_split.h"
+#include "src/trace_processor/sqlite/sqlite_raw_table.h"
#include "src/trace_processor/sqlite/sqlite_table.h"
#include "src/trace_processor/sqlite/sqlite_utils.h"
+#include "src/trace_processor/sqlite/stats_table.h"
#include "src/trace_processor/sqlite/window_operator_table.h"
-#include "src/trace_processor/sqlite_raw_table.h"
-#include "src/trace_processor/stats_table.h"
#include "src/trace_processor/types/variadic.h"
#include "src/trace_processor/metrics/metrics.descriptor.h"
