tp: move sorter into its own folder
Now that there are several files all taking care of sorting, it's worth
pushing everything into its own folder
Change-Id: I163dc100fd7b2311d99c23953c8591571b241865
diff --git a/Android.bp b/Android.bp
index e0f1ead..8c557a4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1984,6 +1984,7 @@
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metatrace",
":perfetto_src_trace_processor_metrics_metrics",
+ ":perfetto_src_trace_processor_sorter_sorter",
":perfetto_src_trace_processor_sqlite_functions_functions",
":perfetto_src_trace_processor_sqlite_sqlite",
":perfetto_src_trace_processor_sqlite_sqlite_minimal",
@@ -9638,6 +9639,23 @@
],
}
+// GN: //src/trace_processor/sorter:sorter
+filegroup {
+ name: "perfetto_src_trace_processor_sorter_sorter",
+ srcs: [
+ "src/trace_processor/sorter/trace_sorter.cc",
+ ],
+}
+
+// GN: //src/trace_processor/sorter:unittests
+filegroup {
+ name: "perfetto_src_trace_processor_sorter_unittests",
+ srcs: [
+ "src/trace_processor/sorter/trace_sorter_queue_unittest.cc",
+ "src/trace_processor/sorter/trace_sorter_unittest.cc",
+ ],
+}
+
// GN: //src/trace_processor/sqlite/functions:functions
filegroup {
name: "perfetto_src_trace_processor_sqlite_functions_functions",
@@ -9745,7 +9763,6 @@
"src/trace_processor/trace_processor_context.cc",
"src/trace_processor/trace_processor_storage.cc",
"src/trace_processor/trace_processor_storage_impl.cc",
- "src/trace_processor/trace_sorter.cc",
"src/trace_processor/virtual_destructors.cc",
],
}
@@ -9812,8 +9829,6 @@
"src/trace_processor/importers/syscalls/syscall_tracker_unittest.cc",
"src/trace_processor/importers/systrace/systrace_parser_unittest.cc",
"src/trace_processor/ref_counted_unittest.cc",
- "src/trace_processor/trace_sorter_queue_unittest.cc",
- "src/trace_processor/trace_sorter_unittest.cc",
],
}
@@ -11240,6 +11255,8 @@
":perfetto_src_trace_processor_metrics_unittests",
":perfetto_src_trace_processor_rpc_rpc",
":perfetto_src_trace_processor_rpc_unittests",
+ ":perfetto_src_trace_processor_sorter_sorter",
+ ":perfetto_src_trace_processor_sorter_unittests",
":perfetto_src_trace_processor_sqlite_functions_functions",
":perfetto_src_trace_processor_sqlite_functions_unittests",
":perfetto_src_trace_processor_sqlite_sqlite",
@@ -11884,6 +11901,7 @@
":perfetto_src_trace_processor_metrics_metrics",
":perfetto_src_trace_processor_rpc_httpd",
":perfetto_src_trace_processor_rpc_rpc",
+ ":perfetto_src_trace_processor_sorter_sorter",
":perfetto_src_trace_processor_sqlite_functions_functions",
":perfetto_src_trace_processor_sqlite_sqlite",
":perfetto_src_trace_processor_sqlite_sqlite_minimal",
@@ -12080,6 +12098,7 @@
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metatrace",
":perfetto_src_trace_processor_metrics_metrics",
+ ":perfetto_src_trace_processor_sorter_sorter",
":perfetto_src_trace_processor_sqlite_functions_functions",
":perfetto_src_trace_processor_sqlite_sqlite",
":perfetto_src_trace_processor_sqlite_sqlite_minimal",
diff --git a/BUILD b/BUILD
index 6c5757f..34e9f5b 100644
--- a/BUILD
+++ b/BUILD
@@ -1614,6 +1614,17 @@
],
)
+# GN target: //src/trace_processor/sorter:sorter
+perfetto_filegroup(
+ name = "src_trace_processor_sorter_sorter",
+ srcs = [
+ "src/trace_processor/sorter/trace_sorter.cc",
+ "src/trace_processor/sorter/trace_sorter.h",
+ "src/trace_processor/sorter/trace_sorter_internal.h",
+ "src/trace_processor/sorter/trace_sorter_queue.h",
+ ],
+)
+
# GN target: //src/trace_processor/sqlite/functions:functions
perfetto_filegroup(
name = "src_trace_processor_sqlite_functions_functions",
@@ -2008,10 +2019,6 @@
"src/trace_processor/trace_processor_storage.cc",
"src/trace_processor/trace_processor_storage_impl.cc",
"src/trace_processor/trace_processor_storage_impl.h",
- "src/trace_processor/trace_sorter.cc",
- "src/trace_processor/trace_sorter.h",
- "src/trace_processor/trace_sorter_internal.h",
- "src/trace_processor/trace_sorter_queue.h",
"src/trace_processor/virtual_destructors.cc",
],
)
@@ -4408,6 +4415,7 @@
":src_trace_processor_lib",
":src_trace_processor_metatrace",
":src_trace_processor_metrics_metrics",
+ ":src_trace_processor_sorter_sorter",
":src_trace_processor_sqlite_functions_functions",
":src_trace_processor_sqlite_sqlite",
":src_trace_processor_sqlite_sqlite_minimal",
@@ -4544,6 +4552,7 @@
":src_trace_processor_metrics_metrics",
":src_trace_processor_rpc_httpd",
":src_trace_processor_rpc_rpc",
+ ":src_trace_processor_sorter_sorter",
":src_trace_processor_sqlite_functions_functions",
":src_trace_processor_sqlite_sqlite",
":src_trace_processor_sqlite_sqlite_minimal",
@@ -4735,6 +4744,7 @@
":src_trace_processor_lib",
":src_trace_processor_metatrace",
":src_trace_processor_metrics_metrics",
+ ":src_trace_processor_sorter_sorter",
":src_trace_processor_sqlite_functions_functions",
":src_trace_processor_sqlite_sqlite",
":src_trace_processor_sqlite_sqlite_minimal",
diff --git a/src/trace_processor/BUILD.gn b/src/trace_processor/BUILD.gn
index 54a1669..13d9f99 100644
--- a/src/trace_processor/BUILD.gn
+++ b/src/trace_processor/BUILD.gn
@@ -158,10 +158,6 @@
"trace_processor_storage.cc",
"trace_processor_storage_impl.cc",
"trace_processor_storage_impl.h",
- "trace_sorter.cc",
- "trace_sorter.h",
- "trace_sorter_internal.h",
- "trace_sorter_queue.h",
"virtual_destructors.cc",
]
deps = [
@@ -178,6 +174,7 @@
"importers/memory_tracker:graph_processor",
"importers/proto:storage_minimal",
"importers/systrace:systrace_line",
+ "sorter",
"storage",
"tables",
"types",
@@ -335,8 +332,6 @@
"importers/syscalls/syscall_tracker_unittest.cc",
"importers/systrace/systrace_parser_unittest.cc",
"ref_counted_unittest.cc",
- "trace_sorter_queue_unittest.cc",
- "trace_sorter_unittest.cc",
]
deps = [
":gen_cc_test_messages_descriptor",
@@ -372,6 +367,8 @@
"importers/proto:storage_minimal",
"importers/proto:unittests",
"rpc:unittests",
+ "sorter",
+ "sorter:unittests",
"sqlite/functions:unittests",
"storage",
"tables:unittests",
diff --git a/src/trace_processor/forwarding_trace_parser.cc b/src/trace_processor/forwarding_trace_parser.cc
index c0e4d59..d8ce547 100644
--- a/src/trace_processor/forwarding_trace_parser.cc
+++ b/src/trace_processor/forwarding_trace_parser.cc
@@ -22,7 +22,7 @@
#include "src/trace_processor/importers/ninja/ninja_log_parser.h"
#include "src/trace_processor/importers/proto/proto_trace_parser.h"
#include "src/trace_processor/importers/proto/proto_trace_reader.h"
-#include "src/trace_processor/trace_sorter.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/importers/BUILD.gn b/src/trace_processor/importers/BUILD.gn
index f5de8ae..8549539 100644
--- a/src/trace_processor/importers/BUILD.gn
+++ b/src/trace_processor/importers/BUILD.gn
@@ -99,6 +99,7 @@
"../../../protos/perfetto/trace/gpu:zero",
"../../../protos/perfetto/trace/interned_data:zero",
"../../protozero",
+ "../sorter",
"../storage",
"../tables",
"../types",
diff --git a/src/trace_processor/importers/ftrace/ftrace_tokenizer.cc b/src/trace_processor/importers/ftrace/ftrace_tokenizer.cc
index 8a376ab..81a2af9 100644
--- a/src/trace_processor/importers/ftrace/ftrace_tokenizer.cc
+++ b/src/trace_processor/importers/ftrace/ftrace_tokenizer.cc
@@ -20,9 +20,9 @@
#include "perfetto/protozero/proto_decoder.h"
#include "perfetto/protozero/proto_utils.h"
#include "src/trace_processor/importers/proto/packet_sequence_state.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include "src/trace_processor/storage/stats.h"
#include "src/trace_processor/storage/trace_storage.h"
-#include "src/trace_processor/trace_sorter.h"
#include "protos/perfetto/common/builtin_clock.pbzero.h"
#include "protos/perfetto/trace/ftrace/ftrace_event.pbzero.h"
diff --git a/src/trace_processor/importers/fuchsia/fuchsia_parser_unittest.cc b/src/trace_processor/importers/fuchsia/fuchsia_parser_unittest.cc
index 2df64fc..69e14f3 100644
--- a/src/trace_processor/importers/fuchsia/fuchsia_parser_unittest.cc
+++ b/src/trace_processor/importers/fuchsia/fuchsia_parser_unittest.cc
@@ -35,9 +35,9 @@
#include "src/trace_processor/importers/proto/metadata_tracker.h"
#include "src/trace_processor/importers/proto/proto_trace_parser.h"
#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include "src/trace_processor/storage/metadata.h"
#include "src/trace_processor/storage/trace_storage.h"
-#include "src/trace_processor/trace_sorter.h"
#include "src/trace_processor/util/descriptors.h"
#include "test/gtest_and_gmock.h"
diff --git a/src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.cc b/src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.cc
index 204be80..fedadeb 100644
--- a/src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.cc
+++ b/src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.cc
@@ -26,7 +26,7 @@
#include "src/trace_processor/importers/fuchsia/fuchsia_record.h"
#include "src/trace_processor/importers/proto/proto_trace_parser.h"
#include "src/trace_processor/importers/proto/proto_trace_reader.h"
-#include "src/trace_processor/trace_sorter.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include "src/trace_processor/types/task_state.h"
#include "src/trace_processor/types/trace_processor_context.h"
diff --git a/src/trace_processor/importers/json/json_trace_tokenizer.cc b/src/trace_processor/importers/json/json_trace_tokenizer.cc
index 580c73f..e8d1b13 100644
--- a/src/trace_processor/importers/json/json_trace_tokenizer.cc
+++ b/src/trace_processor/importers/json/json_trace_tokenizer.cc
@@ -23,8 +23,8 @@
#include "perfetto/trace_processor/trace_blob_view.h"
#include "src/trace_processor/importers/json/json_utils.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include "src/trace_processor/storage/stats.h"
-#include "src/trace_processor/trace_sorter.h"
#include "src/trace_processor/util/status_macros.h"
namespace perfetto {
diff --git a/src/trace_processor/importers/ninja/ninja_log_parser.cc b/src/trace_processor/importers/ninja/ninja_log_parser.cc
index 0b7be37..232590f 100644
--- a/src/trace_processor/importers/ninja/ninja_log_parser.cc
+++ b/src/trace_processor/importers/ninja/ninja_log_parser.cc
@@ -21,8 +21,8 @@
#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/sorter/trace_sorter.h"
#include "src/trace_processor/storage/trace_storage.h"
-#include "src/trace_processor/trace_sorter.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/importers/proto/android_camera_event_module.cc b/src/trace_processor/importers/proto/android_camera_event_module.cc
index 8e80e50..7d52938 100644
--- a/src/trace_processor/importers/proto/android_camera_event_module.cc
+++ b/src/trace_processor/importers/proto/android_camera_event_module.cc
@@ -24,8 +24,8 @@
#include "src/trace_processor/importers/common/track_tracker.h"
#include "src/trace_processor/importers/proto/async_track_set_tracker.h"
#include "src/trace_processor/importers/proto/packet_sequence_state.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include "src/trace_processor/storage/trace_storage.h"
-#include "src/trace_processor/trace_sorter.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/importers/proto/android_probes_module.cc b/src/trace_processor/importers/proto/android_probes_module.cc
index 4371ba9..9d7535a 100644
--- a/src/trace_processor/importers/proto/android_probes_module.cc
+++ b/src/trace_processor/importers/proto/android_probes_module.cc
@@ -23,7 +23,7 @@
#include "src/trace_processor/importers/proto/android_probes_parser.h"
#include "src/trace_processor/importers/proto/android_probes_tracker.h"
#include "src/trace_processor/importers/proto/packet_sequence_state.h"
-#include "src/trace_processor/trace_sorter.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include "protos/perfetto/common/android_energy_consumer_descriptor.pbzero.h"
#include "protos/perfetto/config/trace_config.pbzero.h"
diff --git a/src/trace_processor/importers/proto/profile_module.cc b/src/trace_processor/importers/proto/profile_module.cc
index c1eef5d..d5b9be3 100644
--- a/src/trace_processor/importers/proto/profile_module.cc
+++ b/src/trace_processor/importers/proto/profile_module.cc
@@ -31,10 +31,10 @@
#include "src/trace_processor/importers/proto/profile_packet_utils.h"
#include "src/trace_processor/importers/proto/profiler_util.h"
#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include "src/trace_processor/storage/stats.h"
#include "src/trace_processor/storage/trace_storage.h"
#include "src/trace_processor/tables/profiler_tables.h"
-#include "src/trace_processor/trace_sorter.h"
#include "src/trace_processor/types/trace_processor_context.h"
#include "src/trace_processor/util/stack_traces_util.h"
diff --git a/src/trace_processor/importers/proto/proto_trace_parser.cc b/src/trace_processor/importers/proto/proto_trace_parser.cc
index e17c302..ec6d2a7 100644
--- a/src/trace_processor/importers/proto/proto_trace_parser.cc
+++ b/src/trace_processor/importers/proto/proto_trace_parser.cc
@@ -37,6 +37,7 @@
#include "src/trace_processor/importers/ftrace/ftrace_module.h"
#include "src/trace_processor/importers/proto/metadata_tracker.h"
#include "src/trace_processor/importers/proto/packet_sequence_state.h"
+#include "src/trace_processor/importers/proto/track_event_module.h"
#include "src/trace_processor/storage/metadata.h"
#include "src/trace_processor/storage/stats.h"
#include "src/trace_processor/types/trace_processor_context.h"
@@ -50,7 +51,6 @@
#include "protos/perfetto/trace/perfetto/perfetto_metatrace.pbzero.h"
#include "protos/perfetto/trace/trace_packet.pbzero.h"
#include "protos/perfetto/trace/trace_uuid.pbzero.h"
-#include "track_event_module.h"
namespace perfetto {
namespace trace_processor {
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 b7d3894..3b550a3 100644
--- a/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc
+++ b/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc
@@ -34,9 +34,9 @@
#include "src/trace_processor/importers/proto/metadata_tracker.h"
#include "src/trace_processor/importers/proto/proto_trace_parser.h"
#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include "src/trace_processor/storage/metadata.h"
#include "src/trace_processor/storage/trace_storage.h"
-#include "src/trace_processor/trace_sorter.h"
#include "src/trace_processor/util/descriptors.h"
#include "test/gtest_and_gmock.h"
diff --git a/src/trace_processor/importers/proto/proto_trace_reader.cc b/src/trace_processor/importers/proto/proto_trace_reader.cc
index e625ce1..3946293 100644
--- a/src/trace_processor/importers/proto/proto_trace_reader.cc
+++ b/src/trace_processor/importers/proto/proto_trace_reader.cc
@@ -33,9 +33,9 @@
#include "src/trace_processor/importers/proto/metadata_tracker.h"
#include "src/trace_processor/importers/proto/packet_sequence_state.h"
#include "src/trace_processor/importers/proto/proto_incremental_state.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include "src/trace_processor/storage/stats.h"
#include "src/trace_processor/storage/trace_storage.h"
-#include "src/trace_processor/trace_sorter.h"
#include "src/trace_processor/util/descriptors.h"
#include "src/trace_processor/util/gzip_utils.h"
diff --git a/src/trace_processor/importers/proto/statsd_module.cc b/src/trace_processor/importers/proto/statsd_module.cc
index 5f2c4e5..68f47e1 100644
--- a/src/trace_processor/importers/proto/statsd_module.cc
+++ b/src/trace_processor/importers/proto/statsd_module.cc
@@ -22,8 +22,8 @@
#include "src/trace_processor/importers/common/track_tracker.h"
#include "src/trace_processor/importers/json/json_utils.h"
#include "src/trace_processor/importers/proto/async_track_set_tracker.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include "src/trace_processor/storage/trace_storage.h"
-#include "src/trace_processor/trace_sorter.h"
#include "src/trace_processor/util/descriptors.h"
#include "src/trace_processor/importers/atoms.descriptor.h"
diff --git a/src/trace_processor/importers/proto/track_event_tokenizer.cc b/src/trace_processor/importers/proto/track_event_tokenizer.cc
index 1a5acf6..331696d 100644
--- a/src/trace_processor/importers/proto/track_event_tokenizer.cc
+++ b/src/trace_processor/importers/proto/track_event_tokenizer.cc
@@ -24,9 +24,9 @@
#include "src/trace_processor/importers/proto/packet_sequence_state.h"
#include "src/trace_processor/importers/proto/proto_trace_reader.h"
#include "src/trace_processor/importers/proto/track_event_tracker.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include "src/trace_processor/storage/stats.h"
#include "src/trace_processor/storage/trace_storage.h"
-#include "src/trace_processor/trace_sorter.h"
#include "protos/perfetto/common/builtin_clock.pbzero.h"
#include "protos/perfetto/trace/trace_packet.pbzero.h"
diff --git a/src/trace_processor/importers/systrace/systrace_trace_parser.cc b/src/trace_processor/importers/systrace/systrace_trace_parser.cc
index 0fe8781..167b3c3 100644
--- a/src/trace_processor/importers/systrace/systrace_trace_parser.cc
+++ b/src/trace_processor/importers/systrace/systrace_trace_parser.cc
@@ -21,7 +21,7 @@
#include "perfetto/ext/base/string_utils.h"
#include "src/trace_processor/forwarding_trace_parser.h"
#include "src/trace_processor/importers/common/process_tracker.h"
-#include "src/trace_processor/trace_sorter.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include <cctype>
#include <cinttypes>
diff --git a/src/trace_processor/sorter/BUILD.gn b/src/trace_processor/sorter/BUILD.gn
new file mode 100644
index 0000000..7d76fb3
--- /dev/null
+++ b/src/trace_processor/sorter/BUILD.gn
@@ -0,0 +1,58 @@
+# Copyright (C) 2018 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.
+
+import("../../../gn/perfetto.gni")
+import("../../../gn/test.gni")
+
+# Prevent that this file is accidentally included in embedder builds.
+assert(enable_perfetto_trace_processor)
+
+source_set("sorter") {
+ sources = [
+ "trace_sorter.cc",
+ "trace_sorter.h",
+ "trace_sorter_internal.h",
+ "trace_sorter_queue.h",
+ ]
+ deps = [
+ "../../../gn:default_deps",
+ "../../../include/perfetto/trace_processor:storage",
+ "../../base",
+ "../importers/common:parser_types",
+ "../importers/common:trace_parser_hdr",
+ "../importers/fuchsia:fuchsia_record",
+ "../importers/systrace:systrace_line",
+ "../storage",
+ "../types",
+ ]
+}
+
+perfetto_unittest_source_set("unittests") {
+ testonly = true
+ sources = [
+ "trace_sorter_queue_unittest.cc",
+ "trace_sorter_unittest.cc",
+ ]
+ deps = [
+ ":sorter",
+ "..:storage_minimal",
+ "../../../gn:default_deps",
+ "../../../gn:gtest_and_gmock",
+ "../../../include/perfetto/trace_processor:storage",
+ "../../base",
+ "../importers/common:parser_types",
+ "../importers/proto:storage_minimal",
+ "../types",
+ ]
+}
diff --git a/src/trace_processor/trace_sorter.cc b/src/trace_processor/sorter/trace_sorter.cc
similarity index 98%
rename from src/trace_processor/trace_sorter.cc
rename to src/trace_processor/sorter/trace_sorter.cc
index f50a722..d855512 100644
--- a/src/trace_processor/trace_sorter.cc
+++ b/src/trace_processor/sorter/trace_sorter.cc
@@ -20,9 +20,9 @@
#include "src/trace_processor/importers/common/parser_types.h"
#include "src/trace_processor/importers/fuchsia/fuchsia_record.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
+#include "src/trace_processor/sorter/trace_sorter_queue.h"
#include "src/trace_processor/storage/trace_storage.h"
-#include "src/trace_processor/trace_sorter.h"
-#include "src/trace_processor/trace_sorter_queue.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/trace_sorter.h b/src/trace_processor/sorter/trace_sorter.h
similarity index 98%
rename from src/trace_processor/trace_sorter.h
rename to src/trace_processor/sorter/trace_sorter.h
index 5fae992..22d21da 100644
--- a/src/trace_processor/trace_sorter.h
+++ b/src/trace_processor/sorter/trace_sorter.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_TRACE_SORTER_H_
-#define SRC_TRACE_PROCESSOR_TRACE_SORTER_H_
+#ifndef SRC_TRACE_PROCESSOR_SORTER_TRACE_SORTER_H_
+#define SRC_TRACE_PROCESSOR_SORTER_TRACE_SORTER_H_
#include <algorithm>
#include <memory>
@@ -30,7 +30,7 @@
#include "src/trace_processor/importers/common/trace_parser.h"
#include "src/trace_processor/importers/fuchsia/fuchsia_record.h"
#include "src/trace_processor/importers/systrace/systrace_line.h"
-#include "src/trace_processor/trace_sorter_queue.h"
+#include "src/trace_processor/sorter/trace_sorter_queue.h"
#include "src/trace_processor/types/trace_processor_context.h"
namespace perfetto {
@@ -400,4 +400,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_TRACE_SORTER_H_
+#endif // SRC_TRACE_PROCESSOR_SORTER_TRACE_SORTER_H_
diff --git a/src/trace_processor/trace_sorter_internal.h b/src/trace_processor/sorter/trace_sorter_internal.h
similarity index 97%
rename from src/trace_processor/trace_sorter_internal.h
rename to src/trace_processor/sorter/trace_sorter_internal.h
index de3ccfe..1237cc9 100644
--- a/src/trace_processor/trace_sorter_internal.h
+++ b/src/trace_processor/sorter/trace_sorter_internal.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_TRACE_SORTER_INTERNAL_H_
-#define SRC_TRACE_PROCESSOR_TRACE_SORTER_INTERNAL_H_
+#ifndef SRC_TRACE_PROCESSOR_SORTER_TRACE_SORTER_INTERNAL_H_
+#define SRC_TRACE_PROCESSOR_SORTER_TRACE_SORTER_INTERNAL_H_
#include <deque>
@@ -242,4 +242,4 @@
} // namespace trace_sorter_internal
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_TRACE_SORTER_INTERNAL_H_
+#endif // SRC_TRACE_PROCESSOR_SORTER_TRACE_SORTER_INTERNAL_H_
diff --git a/src/trace_processor/trace_sorter_queue.h b/src/trace_processor/sorter/trace_sorter_queue.h
similarity index 97%
rename from src/trace_processor/trace_sorter_queue.h
rename to src/trace_processor/sorter/trace_sorter_queue.h
index 70926e0..e2d6318 100644
--- a/src/trace_processor/trace_sorter_queue.h
+++ b/src/trace_processor/sorter/trace_sorter_queue.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_TRACE_SORTER_QUEUE_H_
-#define SRC_TRACE_PROCESSOR_TRACE_SORTER_QUEUE_H_
+#ifndef SRC_TRACE_PROCESSOR_SORTER_TRACE_SORTER_QUEUE_H_
+#define SRC_TRACE_PROCESSOR_SORTER_TRACE_SORTER_QUEUE_H_
#include <cstddef>
#include <deque>
@@ -23,7 +23,7 @@
#include "perfetto/base/logging.h"
#include "perfetto/ext/base/small_vector.h"
#include "perfetto/ext/base/utils.h"
-#include "src/trace_processor/trace_sorter_internal.h"
+#include "src/trace_processor/sorter/trace_sorter_internal.h"
namespace perfetto {
namespace trace_processor {
@@ -360,4 +360,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_TRACE_SORTER_QUEUE_H_
+#endif // SRC_TRACE_PROCESSOR_SORTER_TRACE_SORTER_QUEUE_H_
diff --git a/src/trace_processor/trace_sorter_queue_unittest.cc b/src/trace_processor/sorter/trace_sorter_queue_unittest.cc
similarity index 97%
rename from src/trace_processor/trace_sorter_queue_unittest.cc
rename to src/trace_processor/sorter/trace_sorter_queue_unittest.cc
index eb300d4..9620773 100644
--- a/src/trace_processor/trace_sorter_queue_unittest.cc
+++ b/src/trace_processor/sorter/trace_sorter_queue_unittest.cc
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "src/trace_processor/trace_sorter_queue.h"
+#include "src/trace_processor/sorter/trace_sorter_queue.h"
#include "src/trace_processor/types/variadic.h"
#include "test/gtest_and_gmock.h"
diff --git a/src/trace_processor/trace_sorter_unittest.cc b/src/trace_processor/sorter/trace_sorter_unittest.cc
similarity index 99%
rename from src/trace_processor/trace_sorter_unittest.cc
rename to src/trace_processor/sorter/trace_sorter_unittest.cc
index e689fa9..53a1ebe 100644
--- a/src/trace_processor/trace_sorter_unittest.cc
+++ b/src/trace_processor/sorter/trace_sorter_unittest.cc
@@ -23,7 +23,7 @@
#include "perfetto/trace_processor/trace_blob.h"
#include "src/trace_processor/importers/common/parser_types.h"
#include "src/trace_processor/importers/proto/packet_sequence_state.h"
-#include "src/trace_processor/trace_sorter.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include "src/trace_processor/types/trace_processor_context.h"
#include "test/gtest_and_gmock.h"
diff --git a/src/trace_processor/trace_processor_context.cc b/src/trace_processor/trace_processor_context.cc
index 1f996db..c9c2774 100644
--- a/src/trace_processor/trace_processor_context.cc
+++ b/src/trace_processor/trace_processor_context.cc
@@ -38,7 +38,7 @@
#include "src/trace_processor/importers/proto/proto_trace_parser.h"
#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
#include "src/trace_processor/importers/proto/track_event_module.h"
-#include "src/trace_processor/trace_sorter.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include "src/trace_processor/types/destructible.h"
namespace perfetto {
diff --git a/src/trace_processor/trace_processor_storage_impl.cc b/src/trace_processor/trace_processor_storage_impl.cc
index 937bddd..11a955d 100644
--- a/src/trace_processor/trace_processor_storage_impl.cc
+++ b/src/trace_processor/trace_processor_storage_impl.cc
@@ -38,7 +38,7 @@
#include "src/trace_processor/importers/proto/proto_trace_reader.h"
#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
#include "src/trace_processor/importers/track_event.descriptor.h"
-#include "src/trace_processor/trace_sorter.h"
+#include "src/trace_processor/sorter/trace_sorter.h"
#include "src/trace_processor/util/descriptors.h"
namespace perfetto {
