Google Git
Sign in
fuchsia/third_party/github.com/google/perfetto/refs/heads/upstream/dev/lalitm/multi-conn-tp^!/.
commit
2f46332dca340647edc797f325ff43283627deb9
[log]
author
Lalit Maganti <lalitmaganti@gmail.com>
Fri May 01 02:37:45 2026 +0100
committer
Lalit Maganti <lalitmaganti@gmail.com>
Fri May 01 02:37:45 2026 +0100
tree
315ce1e3a16ce52edc5c0995ecee876273927026
parent
9a6706977135eee90f64692f28d4cf336da80a6c [diff]
Fix

diff --git a/Android.bp b/Android.bp
index ea34966..573ba2f 100644
--- a/Android.bp
+++ b/Android.bp

@@ -16674,7 +16674,8 @@
     srcs: [
         "src/trace_processor/perfetto_sql/engine/created_function.cc",
         "src/trace_processor/perfetto_sql/engine/dataframe_module.cc",
-        "src/trace_processor/perfetto_sql/engine/perfetto_sql_engine.cc",
+        "src/trace_processor/perfetto_sql/engine/perfetto_sql_connection.cc",
+        "src/trace_processor/perfetto_sql/engine/perfetto_sql_database.cc",
         "src/trace_processor/perfetto_sql/engine/runtime_table_function.cc",
         "src/trace_processor/perfetto_sql/engine/static_table_function_module.cc",
         "src/trace_processor/perfetto_sql/engine/table_pointer_module.cc",
@@ -16685,7 +16686,7 @@
 filegroup {
     name: "perfetto_src_trace_processor_perfetto_sql_engine_unittests",
     srcs: [
-        "src/trace_processor/perfetto_sql/engine/perfetto_sql_engine_unittest.cc",
+        "src/trace_processor/perfetto_sql/engine/perfetto_sql_connection_unittest.cc",
     ],
 }
 
@@ -17534,6 +17535,7 @@
     name: "perfetto_src_trace_processor_rpc_unittests",
     srcs: [
         "src/trace_processor/rpc/query_result_serializer_unittest.cc",
+        "src/trace_processor/rpc/rpc_unittest.cc",
     ],
 }
 
@@ -17615,6 +17617,7 @@
     name: "perfetto_src_trace_processor_sqlite_unittests",
     srcs: [
         "src/trace_processor/sqlite/sql_source_unittest.cc",
+        "src/trace_processor/sqlite/sqlite_engine_unittest.cc",
         "src/trace_processor/sqlite/sqlite_utils_unittest.cc",
     ],
 }
@@ -17750,6 +17753,7 @@
         ":perfetto_include_perfetto_ext_base_base",
         ":perfetto_include_perfetto_ext_base_http_http",
         ":perfetto_include_perfetto_ext_base_regex",
+        ":perfetto_include_perfetto_ext_base_threading_threading",
         ":perfetto_include_perfetto_ext_base_version",
         ":perfetto_include_perfetto_ext_protozero_protozero",
         ":perfetto_include_perfetto_ext_trace_processor_demangle",
@@ -17826,6 +17830,7 @@
         ":perfetto_src_base_clock_snapshots",
         ":perfetto_src_base_http_http",
         ":perfetto_src_base_regex_regex",
+        ":perfetto_src_base_threading_threading",
         ":perfetto_src_base_unix_socket",
         ":perfetto_src_base_version",
         ":perfetto_src_kernel_utils_kernel_wakelock_errors",
@@ -18166,6 +18171,14 @@
     },
 }
 
+// GN: //src/trace_processor:trace_processor_unittests
+filegroup {
+    name: "perfetto_src_trace_processor_trace_processor_unittests",
+    srcs: [
+        "src/trace_processor/trace_processor_connection_unittest.cc",
+    ],
+}
+
 // GN: //src/trace_processor/trace_summary:gen_cc_trace_summary_descriptor
 genrule {
     name: "perfetto_src_trace_processor_trace_summary_gen_cc_trace_summary_descriptor",
@@ -20424,6 +20437,7 @@
         ":perfetto_src_trace_processor_storage_storage",
         ":perfetto_src_trace_processor_tables_tables",
         ":perfetto_src_trace_processor_top_level_unittests",
+        ":perfetto_src_trace_processor_trace_processor_unittests",
         ":perfetto_src_trace_processor_trace_summary_trace_summary",
         ":perfetto_src_trace_processor_trace_summary_unittests",
         ":perfetto_src_trace_processor_types_types",

diff --git a/BUILD b/BUILD
index 4673428..ea3a7b6 100644
--- a/BUILD
+++ b/BUILD

@@ -322,6 +322,7 @@
                ":include_perfetto_base_base",
                ":include_perfetto_ext_base_base",
                ":include_perfetto_ext_base_regex",
+               ":include_perfetto_ext_base_threading_threading",
                ":include_perfetto_ext_base_version",
                ":include_perfetto_ext_protozero_protozero",
                ":include_perfetto_ext_trace_processor_demangle",
@@ -377,6 +378,7 @@
                ":src_base_base",
                ":src_base_clock_snapshots",
                ":src_base_regex_regex",
+               ":src_base_threading_threading",
                ":src_base_version",
                ":src_kernel_utils_kernel_wakelock_errors",
                ":src_kernel_utils_syscall_table",
@@ -533,6 +535,7 @@
                ":include_perfetto_ext_base_base",
                ":include_perfetto_ext_base_http_http",
                ":include_perfetto_ext_base_regex",
+               ":include_perfetto_ext_base_threading_threading",
                ":include_perfetto_ext_base_version",
                ":include_perfetto_ext_protozero_protozero",
                ":include_perfetto_ext_trace_processor_demangle",
@@ -592,6 +595,7 @@
                ":src_base_clock_snapshots",
                ":src_base_http_http",
                ":src_base_regex_regex",
+               ":src_base_threading_threading",
                ":src_base_version",
                ":src_kernel_utils_kernel_wakelock_errors",
                ":src_kernel_utils_syscall_table",
@@ -1007,6 +1011,21 @@
     linkstatic = True,
 )
 
+# GN target: //include/perfetto/ext/base/threading:threading
+perfetto_cc_library(
+    name = "include_perfetto_ext_base_threading_threading",
+    hdrs = [
+        "include/perfetto/ext/base/threading/thread_pool.h",
+    ],
+    deps = [
+        ":include_perfetto_base_base",
+        ":include_perfetto_ext_base_base",
+        ":include_perfetto_public_abi_base",
+        ":include_perfetto_public_base",
+    ],
+    linkstatic = True,
+)
+
 # GN target: //include/perfetto/ext/base:base
 perfetto_cc_library(
     name = "include_perfetto_ext_base_base",
@@ -1738,6 +1757,23 @@
     linkstatic = True,
 )
 
+# GN target: //src/base/threading:threading
+perfetto_cc_library(
+    name = "src_base_threading_threading",
+    srcs = [
+        "src/base/threading/thread_pool.cc",
+    ],
+    deps = [
+        ":include_perfetto_base_base",
+        ":include_perfetto_ext_base_base",
+        ":include_perfetto_ext_base_threading_threading",
+        ":include_perfetto_public_abi_base",
+        ":include_perfetto_public_base",
+        ":src_base_base",
+    ] + PERFETTO_CONFIG.deps.base_platform,
+    linkstatic = True,
+)
+
 # GN target: //src/base:base
 perfetto_cc_library(
     name = "src_base_base",
@@ -6638,7 +6674,8 @@
         ":src_trace_processor_tables_tables_python",
         "src/trace_processor/perfetto_sql/engine/created_function.cc",
         "src/trace_processor/perfetto_sql/engine/dataframe_module.cc",
-        "src/trace_processor/perfetto_sql/engine/perfetto_sql_engine.cc",
+        "src/trace_processor/perfetto_sql/engine/perfetto_sql_connection.cc",
+        "src/trace_processor/perfetto_sql/engine/perfetto_sql_database.cc",
         "src/trace_processor/perfetto_sql/engine/runtime_table_function.cc",
         "src/trace_processor/perfetto_sql/engine/static_table_function_module.cc",
         "src/trace_processor/perfetto_sql/engine/table_pointer_module.cc",
@@ -6646,7 +6683,8 @@
     hdrs = [
         "src/trace_processor/perfetto_sql/engine/created_function.h",
         "src/trace_processor/perfetto_sql/engine/dataframe_module.h",
-        "src/trace_processor/perfetto_sql/engine/perfetto_sql_engine.h",
+        "src/trace_processor/perfetto_sql/engine/perfetto_sql_connection.h",
+        "src/trace_processor/perfetto_sql/engine/perfetto_sql_database.h",
         "src/trace_processor/perfetto_sql/engine/runtime_table_function.h",
         "src/trace_processor/perfetto_sql/engine/static_table_function_module.h",
         "src/trace_processor/perfetto_sql/engine/table_pointer_module.h",
@@ -8595,6 +8633,7 @@
                ":include_perfetto_ext_base_base",
                ":include_perfetto_ext_base_http_http",
                ":include_perfetto_ext_base_regex",
+               ":include_perfetto_ext_base_threading_threading",
                ":include_perfetto_ext_base_version",
                ":include_perfetto_ext_protozero_protozero",
                ":include_perfetto_ext_trace_processor_demangle",
@@ -8651,6 +8690,7 @@
                ":src_base_clock_snapshots",
                ":src_base_http_http",
                ":src_base_regex_regex",
+               ":src_base_threading_threading",
                ":src_base_version",
                ":src_kernel_utils_kernel_wakelock_errors",
                ":src_kernel_utils_syscall_table",
@@ -8810,6 +8850,7 @@
                ":include_perfetto_base_base",
                ":include_perfetto_ext_base_base",
                ":include_perfetto_ext_base_regex",
+               ":include_perfetto_ext_base_threading_threading",
                ":include_perfetto_ext_base_version",
                ":include_perfetto_ext_protozero_protozero",
                ":include_perfetto_ext_trace_processor_demangle",
@@ -8865,6 +8906,7 @@
                ":src_base_base",
                ":src_base_clock_snapshots",
                ":src_base_regex_regex",
+               ":src_base_threading_threading",
                ":src_base_version",
                ":src_kernel_utils_kernel_wakelock_errors",
                ":src_kernel_utils_syscall_table",
@@ -9022,6 +9064,7 @@
                ":include_perfetto_base_base",
                ":include_perfetto_ext_base_base",
                ":include_perfetto_ext_base_regex",
+               ":include_perfetto_ext_base_threading_threading",
                ":include_perfetto_ext_base_version",
                ":include_perfetto_ext_protozero_protozero",
                ":include_perfetto_ext_trace_processor_demangle",
@@ -9077,6 +9120,7 @@
                ":src_base_base",
                ":src_base_clock_snapshots",
                ":src_base_regex_regex",
+               ":src_base_threading_threading",
                ":src_base_version",
                ":src_kernel_utils_kernel_wakelock_errors",
                ":src_kernel_utils_syscall_table",
@@ -9262,6 +9306,7 @@
                ":include_perfetto_ext_base_base",
                ":include_perfetto_ext_base_http_http",
                ":include_perfetto_ext_base_regex",
+               ":include_perfetto_ext_base_threading_threading",
                ":include_perfetto_ext_base_version",
                ":include_perfetto_ext_protozero_protozero",
                ":include_perfetto_ext_trace_processor_demangle",
@@ -9321,6 +9366,7 @@
                ":src_base_clock_snapshots",
                ":src_base_http_http",
                ":src_base_regex_regex",
+               ":src_base_threading_threading",
                ":src_base_version",
                ":src_kernel_utils_kernel_wakelock_errors",
                ":src_kernel_utils_syscall_table",
@@ -17832,6 +17878,7 @@
         ":include_perfetto_ext_base_base",
         ":include_perfetto_ext_base_http_http",
         ":include_perfetto_ext_base_regex",
+        ":include_perfetto_ext_base_threading_threading",
         ":include_perfetto_ext_base_version",
         ":include_perfetto_ext_protozero_protozero",
         ":include_perfetto_ext_trace_processor_demangle",
@@ -17852,6 +17899,7 @@
         ":include_perfetto_trace_processor_util",
         ":src_base_base",
         ":src_base_regex_regex",
+        ":src_base_threading_threading",
         ":src_kernel_utils_kernel_wakelock_errors",
         ":src_kernel_utils_syscall_table",
         ":src_protovm_protovm",

diff --git a/gn/standalone/wasm.gni b/gn/standalone/wasm.gni
index 5934422..a77c3a0 100644
--- a/gn/standalone/wasm.gni
+++ b/gn/standalone/wasm.gni

@@ -41,8 +41,7 @@
   assert(invoker.name + "_wasm" == target_name)
   _lib_name = invoker.name
   _is_memory64 = defined(invoker.is_memory64) && invoker.is_memory64
-  _enable_pthreads =
-      defined(invoker.enable_pthreads) && invoker.enable_pthreads
+  _enable_pthreads = defined(invoker.enable_pthreads) && invoker.enable_pthreads
   assert(!(_is_memory64 && _enable_pthreads),
          "memory64 + pthreads is not a supported emscripten configuration")
   if (is_wasm) {

diff --git a/src/trace_processor/perfetto_sql/engine/BUILD.gn b/src/trace_processor/perfetto_sql/engine/BUILD.gn
index f4a27e4..aa3ce9c 100644
--- a/src/trace_processor/perfetto_sql/engine/BUILD.gn
+++ b/src/trace_processor/perfetto_sql/engine/BUILD.gn

@@ -22,10 +22,10 @@
     "created_function.h",
     "dataframe_module.cc",
     "dataframe_module.h",
-    "perfetto_sql_database.cc",
-    "perfetto_sql_database.h",
     "perfetto_sql_connection.cc",
     "perfetto_sql_connection.h",
+    "perfetto_sql_database.cc",
+    "perfetto_sql_database.h",
     "runtime_table_function.cc",
     "runtime_table_function.h",
     "static_table_function_module.cc",