Add QNX Probes config

Copy the QNX Probes proto configuration so traced_qnx_probes can be
used with the main perfetto project. This has been tested as working
with traced_qnx_probes build from QNX repo and traced + perfetto build
from this project

As part of this commit all changes in order to get Perfetto compiling on
QNX were ported. These changes allow for building on QNX7.1 and QNX8.0
The changes are as listed
- Fix the toolchain to not specify a gcc version as QNX7.1 and QNX8.0 differ
- Disable no-stringop-overflow for is_gcc in upd
- in perfetto_cmd.cc prealloc vector to avoid -Warray-bounds for emplaced string
  this change won't affect the behaviour of the code but remove the error.
- Add x86_64 support for QNX cross compiling.
- Fix getpeereid to no longer take a NULL gid, this is because the change from
  iopkt to io-sock removes the ability to ignore NULL input args. No functional
  for iopkt but will fix segfault in libsocket for io-sock platforms.

Author: lmilne-qnx

Android.bp

@@ -230,6 +230,8 @@ perfetto_cc_library(
         ":protos_perfetto_config_process_stats_zero",
         ":protos_perfetto_config_profiling_cpp",
         ":protos_perfetto_config_profiling_zero",
+        ":protos_perfetto_config_qnx_cpp",
+        ":protos_perfetto_config_qnx_zero",
         ":protos_perfetto_config_statsd_cpp",
         ":protos_perfetto_config_statsd_zero",
         ":protos_perfetto_config_sys_stats_cpp",
@@ -303,6 +305,7 @@ perfetto_cc_binary(
         ":protos_perfetto_config_priority_boost_cpp",
         ":protos_perfetto_config_process_stats_cpp",
         ":protos_perfetto_config_profiling_cpp",
+        ":protos_perfetto_config_qnx_cpp",
         ":protos_perfetto_config_statsd_cpp",
         ":protos_perfetto_config_sys_stats_cpp",
         ":protos_perfetto_config_system_info_cpp",
@@ -475,6 +478,7 @@ perfetto_cc_library(
                ":protos_perfetto_config_priority_boost_zero",
                ":protos_perfetto_config_process_stats_zero",
                ":protos_perfetto_config_profiling_zero",
+               ":protos_perfetto_config_qnx_zero",
                ":protos_perfetto_config_statsd_zero",
                ":protos_perfetto_config_sys_stats_zero",
                ":protos_perfetto_config_system_info_zero",
@@ -681,6 +685,7 @@ perfetto_cc_library(
                ":protos_perfetto_config_priority_boost_zero",
                ":protos_perfetto_config_process_stats_zero",
                ":protos_perfetto_config_profiling_zero",
+               ":protos_perfetto_config_qnx_zero",
                ":protos_perfetto_config_statsd_zero",
                ":protos_perfetto_config_sys_stats_zero",
                ":protos_perfetto_config_system_info_zero",
@@ -780,6 +785,7 @@ perfetto_cc_library(
         ":protos_perfetto_config_priority_boost_zero",
         ":protos_perfetto_config_process_stats_zero",
         ":protos_perfetto_config_profiling_zero",
+        ":protos_perfetto_config_qnx_zero",
         ":protos_perfetto_config_statsd_zero",
         ":protos_perfetto_config_sys_stats_zero",
         ":protos_perfetto_config_system_info_zero",
@@ -851,6 +857,8 @@ perfetto_cc_binary(
         ":protos_perfetto_config_process_stats_zero",
         ":protos_perfetto_config_profiling_cpp",
         ":protos_perfetto_config_profiling_zero",
+        ":protos_perfetto_config_qnx_cpp",
+        ":protos_perfetto_config_qnx_zero",
         ":protos_perfetto_config_statsd_cpp",
         ":protos_perfetto_config_statsd_zero",
         ":protos_perfetto_config_sys_stats_cpp",
@@ -982,6 +990,8 @@ perfetto_cc_library(
         ":protos_perfetto_config_process_stats_zero",
         ":protos_perfetto_config_profiling_cpp",
         ":protos_perfetto_config_profiling_zero",
+        ":protos_perfetto_config_qnx_cpp",
+        ":protos_perfetto_config_qnx_zero",
         ":protos_perfetto_config_statsd_cpp",
         ":protos_perfetto_config_statsd_zero",
         ":protos_perfetto_config_sys_stats_cpp",
@@ -5128,6 +5138,7 @@ perfetto_proto_library(
         ":protos_perfetto_config_process_stats_protos",
         ":protos_perfetto_config_profiling_protos",
         ":protos_perfetto_config_protos",
+        ":protos_perfetto_config_qnx_protos",
         ":protos_perfetto_config_statsd_protos",
         ":protos_perfetto_config_sys_stats_protos",
         ":protos_perfetto_config_system_info_protos",
@@ -5207,6 +5218,7 @@ perfetto_proto_library(
         ":protos_perfetto_config_process_stats_protos",
         ":protos_perfetto_config_profiling_protos",
         ":protos_perfetto_config_protos",
+        ":protos_perfetto_config_qnx_protos",
         ":protos_perfetto_config_statsd_protos",
         ":protos_perfetto_config_sys_stats_protos",
         ":protos_perfetto_config_system_info_protos",
@@ -5691,6 +5703,7 @@ perfetto_cc_library(
         ":protos_perfetto_config_priority_boost_zero_h",
         ":protos_perfetto_config_process_stats_zero_h",
         ":protos_perfetto_config_profiling_zero_h",
+        ":protos_perfetto_config_qnx_zero_h",
         ":protos_perfetto_config_statsd_zero_h",
         ":protos_perfetto_config_sys_stats_zero_h",
         ":protos_perfetto_config_system_info_zero_h",
@@ -5731,6 +5744,7 @@ perfetto_cc_library(
         ":protos_perfetto_config_priority_boost_zero",
         ":protos_perfetto_config_process_stats_zero",
         ":protos_perfetto_config_profiling_zero",
+        ":protos_perfetto_config_qnx_zero",
         ":protos_perfetto_config_statsd_zero",
         ":protos_perfetto_config_sys_stats_zero",
         ":protos_perfetto_config_system_info_zero",
@@ -5905,6 +5919,7 @@ perfetto_cc_protocpp_library(
         ":protos_perfetto_config_process_stats_cpp",
         ":protos_perfetto_config_profiling_cpp",
         ":protos_perfetto_config_protos",
+        ":protos_perfetto_config_qnx_cpp",
         ":protos_perfetto_config_statsd_cpp",
         ":protos_perfetto_config_sys_stats_cpp",
         ":protos_perfetto_config_system_info_cpp",
@@ -6185,13 +6200,46 @@ perfetto_proto_library(
         ":protos_perfetto_config_priority_boost_protos",
         ":protos_perfetto_config_process_stats_protos",
         ":protos_perfetto_config_profiling_protos",
+        ":protos_perfetto_config_qnx_protos",
         ":protos_perfetto_config_statsd_protos",
         ":protos_perfetto_config_sys_stats_protos",
         ":protos_perfetto_config_system_info_protos",
         ":protos_perfetto_config_track_event_protos",
     ],
 )
 
+# GN target: //protos/perfetto/config/qnx:cpp
+perfetto_cc_protocpp_library(
+    name = "protos_perfetto_config_qnx_cpp",
+    deps = [
+        ":protos_perfetto_common_cpp",
+        ":protos_perfetto_config_qnx_protos",
+    ],
+)
+
+# GN target: //protos/perfetto/config/qnx:source_set
+perfetto_proto_library(
+    name = "protos_perfetto_config_qnx_protos",
+    srcs = [
+        "protos/perfetto/config/qnx/qnx_config.proto",
+    ],
+    visibility = [
+        PERFETTO_CONFIG.proto_library_visibility,
+    ],
+    deps = [
+        ":protos_perfetto_common_protos",
+    ],
+)
+
+# GN target: //protos/perfetto/config/qnx:zero
+perfetto_cc_protozero_library(
+    name = "protos_perfetto_config_qnx_zero",
+    deps = [
+        ":protos_perfetto_common_zero",
+        ":protos_perfetto_config_qnx_protos",
+    ],
+)
+
 # GN target: //protos/perfetto/config/statsd:cpp
 perfetto_cc_protocpp_library(
     name = "protos_perfetto_config_statsd_cpp",
@@ -6322,6 +6370,7 @@ perfetto_cc_protozero_library(
         ":protos_perfetto_config_process_stats_zero",
         ":protos_perfetto_config_profiling_zero",
         ":protos_perfetto_config_protos",
+        ":protos_perfetto_config_qnx_zero",
         ":protos_perfetto_config_statsd_zero",
         ":protos_perfetto_config_sys_stats_zero",
         ":protos_perfetto_config_system_info_zero",
@@ -6345,6 +6394,7 @@ perfetto_cc_protocpp_library(
         ":protos_perfetto_config_priority_boost_cpp",
         ":protos_perfetto_config_process_stats_cpp",
         ":protos_perfetto_config_profiling_cpp",
+        ":protos_perfetto_config_qnx_cpp",
         ":protos_perfetto_config_statsd_cpp",
         ":protos_perfetto_config_sys_stats_cpp",
         ":protos_perfetto_config_system_info_cpp",
@@ -6369,6 +6419,7 @@ perfetto_cc_ipc_library(
         ":protos_perfetto_config_priority_boost_cpp",
         ":protos_perfetto_config_process_stats_cpp",
         ":protos_perfetto_config_profiling_cpp",
+        ":protos_perfetto_config_qnx_cpp",
         ":protos_perfetto_config_statsd_cpp",
         ":protos_perfetto_config_sys_stats_cpp",
         ":protos_perfetto_config_system_info_cpp",
@@ -6402,6 +6453,7 @@ perfetto_proto_library(
         ":protos_perfetto_config_process_stats_protos",
         ":protos_perfetto_config_profiling_protos",
         ":protos_perfetto_config_protos",
+        ":protos_perfetto_config_qnx_protos",
         ":protos_perfetto_config_statsd_protos",
         ":protos_perfetto_config_sys_stats_protos",
         ":protos_perfetto_config_system_info_protos",
@@ -7164,6 +7216,7 @@ perfetto_proto_library(
         ":protos_perfetto_config_process_stats_protos",
         ":protos_perfetto_config_profiling_protos",
         ":protos_perfetto_config_protos",
+        ":protos_perfetto_config_qnx_protos",
         ":protos_perfetto_config_statsd_protos",
         ":protos_perfetto_config_sys_stats_protos",
         ":protos_perfetto_config_system_info_protos",
@@ -7186,6 +7239,7 @@ perfetto_cc_protozero_library(
         ":protos_perfetto_config_priority_boost_zero",
         ":protos_perfetto_config_process_stats_zero",
         ":protos_perfetto_config_profiling_zero",
+        ":protos_perfetto_config_qnx_zero",
         ":protos_perfetto_config_statsd_zero",
         ":protos_perfetto_config_sys_stats_zero",
         ":protos_perfetto_config_system_info_zero",
@@ -7226,6 +7280,7 @@ perfetto_proto_library(
         ":protos_perfetto_config_process_stats_protos",
         ":protos_perfetto_config_profiling_protos",
         ":protos_perfetto_config_protos",
+        ":protos_perfetto_config_qnx_protos",
         ":protos_perfetto_config_statsd_protos",
         ":protos_perfetto_config_sys_stats_protos",
         ":protos_perfetto_config_system_info_protos",
@@ -7271,6 +7326,7 @@ perfetto_cc_protozero_library(
         ":protos_perfetto_config_priority_boost_zero",
         ":protos_perfetto_config_process_stats_zero",
         ":protos_perfetto_config_profiling_zero",
+        ":protos_perfetto_config_qnx_zero",
         ":protos_perfetto_config_statsd_zero",
         ":protos_perfetto_config_sys_stats_zero",
         ":protos_perfetto_config_system_info_zero",
@@ -7441,6 +7497,7 @@ perfetto_proto_library(
         ":protos_perfetto_config_process_stats_protos",
         ":protos_perfetto_config_profiling_protos",
         ":protos_perfetto_config_protos",
+        ":protos_perfetto_config_qnx_protos",
         ":protos_perfetto_config_statsd_protos",
         ":protos_perfetto_config_sys_stats_protos",
         ":protos_perfetto_config_system_info_protos",
@@ -7866,6 +7923,8 @@ perfetto_cc_library(
         ":protos_perfetto_config_process_stats_zero",
         ":protos_perfetto_config_profiling_cpp",
         ":protos_perfetto_config_profiling_zero",
+        ":protos_perfetto_config_qnx_cpp",
+        ":protos_perfetto_config_qnx_zero",
         ":protos_perfetto_config_statsd_cpp",
         ":protos_perfetto_config_statsd_zero",
         ":protos_perfetto_config_sys_stats_cpp",
@@ -7967,6 +8026,8 @@ perfetto_cc_binary(
         ":protos_perfetto_config_process_stats_zero",
         ":protos_perfetto_config_profiling_cpp",
         ":protos_perfetto_config_profiling_zero",
+        ":protos_perfetto_config_qnx_cpp",
+        ":protos_perfetto_config_qnx_zero",
         ":protos_perfetto_config_statsd_cpp",
         ":protos_perfetto_config_statsd_zero",
         ":protos_perfetto_config_sys_stats_cpp",
@@ -8147,6 +8208,7 @@ perfetto_cc_library(
                ":protos_perfetto_config_priority_boost_zero",
                ":protos_perfetto_config_process_stats_zero",
                ":protos_perfetto_config_profiling_zero",
+               ":protos_perfetto_config_qnx_zero",
                ":protos_perfetto_config_statsd_zero",
                ":protos_perfetto_config_sys_stats_zero",
                ":protos_perfetto_config_system_info_zero",
@@ -8367,6 +8429,7 @@ perfetto_cc_binary(
                ":protos_perfetto_config_priority_boost_zero",
                ":protos_perfetto_config_process_stats_zero",
                ":protos_perfetto_config_profiling_zero",
+               ":protos_perfetto_config_qnx_zero",
                ":protos_perfetto_config_statsd_zero",
                ":protos_perfetto_config_sys_stats_zero",
                ":protos_perfetto_config_system_info_zero",

BUILD

@@ -587,6 +587,12 @@ config("upb_config") {
     "protobuf/upb/reflection/stage0",  # For pre-generated descriptor.upb.h
     "protobuf/third_party/utf8_range",  # For utf8_range.h
   ]
+  if (is_gcc) {
+    cflags = [
+      "-Wno-stringop-overread",
+      "-Wno-stringop-overflow",
+    ]
+  }
   defines = [ "UPB_BOOTSTRAP_STAGE=0" ]  # Use stage0 minitable functions
 }
 

buildtools/BUILD.gn

@@ -152,6 +152,8 @@ declare_args() {
     _target_triplet = "x86_64-linux-android"
   } else if (target_os == "qnx" && target_cpu == "arm64") {
     _target_triplet = "ntoaarch64"
+  } else if (target_os == "qnx" && target_cpu == "x64") {
+    _target_triplet = "ntox86_64"
   } else {
     assert(
         false,
@@ -194,10 +196,15 @@ declare_args() {
       target_strip = "$android_llvm_dir/bin/llvm-strip"
     } else if (is_qnx) {
       target_ar = "${_target_triplet}-ar"
-      target_cc = "qcc -V8.3.0,gcc_${_target_triplet}le"
-      target_cxx = "q++ -V8.3.0,gcc_${_target_triplet}le_cxx"
       target_linker = "${_target_triplet}-ld"
       target_strip = "${_target_triplet}-strip"
+      if (target_cpu == "arm64") {
+        target_cc = "qcc -Vgcc_${_target_triplet}le"
+        target_cxx = "q++ -Vgcc_${_target_triplet}le_cxx"
+      } else {
+        target_cc = "qcc -Vgcc_${_target_triplet}"
+        target_cxx = "q++ -Vgcc_${_target_triplet}_cxx"
+      }
     } else {
       assert(_target_triplet != "",
              "target_triplet must be non-empty when cross-compiling")

gn/standalone/toolchain/BUILD.gn

@@ -30,6 +30,7 @@
 #if !PERFETTO_BUILDFLAG(PERFETTO_COMPILER_GCC)
 // MinGW has these. clang-cl and MSVC, which use just the Windows SDK, don't.
 using uid_t = int;
+using gid_t = int;
 using pid_t = int;
 #endif  // !GCC
 

include/perfetto/ext/base/sys_types.h

@@ -31,6 +31,7 @@ perfetto_proto_library("@TYPE@") {
     "priority_boost:@TYPE@",
     "process_stats:@TYPE@",
     "profiling:@TYPE@",
+    "qnx:@TYPE@",
     "statsd:@TYPE@",
     "sys_stats:@TYPE@",
     "system_info:@TYPE@",

protos/perfetto/config/BUILD.gn

@@ -59,6 +59,7 @@ import "protos/perfetto/config/test_config.proto";
 import "protos/perfetto/config/track_event/track_event_config.proto";
 import "protos/perfetto/config/system_info/system_info_config.proto";
 import "protos/perfetto/config/chrome/histogram_samples.proto";
+import "protos/perfetto/config/qnx/qnx_config.proto";
 
 // The configuration that is passed to each data source when starting tracing.
 // Next id: 140
@@ -285,6 +286,9 @@ message DataSourceConfig {
   // Data source name: android.inputmethod
   optional InputMethodConfig inputmethod_config = 139 [lazy = true];
 
+  // Data source name: qnx.kernel
+  optional QnxConfig qnx_config = 150 [lazy = true];
+
   // This is a fallback mechanism to send a free-form text config to the
   // producer. In theory this should never be needed. All the code that
   // is part of the platform (i.e. traced service) is supposed to *not* truncate

protos/perfetto/config/data_source_config.proto

@@ -2381,6 +2381,38 @@ message PerfEventConfig {
 
 // End of protos/perfetto/config/profiling/perf_event_config.proto
 
+// Begin of protos/perfetto/config/qnx/qnx_config.proto
+
+message QnxConfig {
+  // The number of buffers that tracelog will init for the QNX trace.
+  optional uint32 qnx_kernel_buffers = 1;
+
+  // The number of kernel buffers that tracelog will init for the QNX trace.
+  optional uint32 qnx_kernel_kbuffers = 2;
+
+  // Flag indicating whether the QNX kernel tracing should produce wide
+  // events which contain additional data or fast events which are most
+  // concise. In fast mode we lose the priority information
+  optional bool qnx_kernel_wide_events = 3;
+
+  // The number of pages initialized by default the parser's page cache.
+  optional uint32 qnx_cache_pages = 4;
+
+  // The max pages the page cache should allocate (must be at least as big)
+  // as the qnx_cache_pages value. Using -1 will allow the cache to grow
+  // unbounded. The cache will prefer to re-use existing pages so growth will
+  // only happen when needed (when parser is not keeping up).
+  optional int32 qnx_cache_max_pages = 5;
+
+  // The initial size of the the buffer used to hold the trace header values
+  // this dynamic buffer will grow as needed but reallocs can be avoided by
+  // selecting an initial size large enough to hold all the initial header
+  // data.
+  optional uint32 qnx_trace_buffer_init_bytes = 6;
+}
+
+// End of protos/perfetto/config/qnx/qnx_config.proto
+
 // Begin of protos/perfetto/config/statsd/atom_ids.proto
 
 // This enum is obtained by post-processing
@@ -4270,6 +4302,9 @@ message DataSourceConfig {
   // Data source name: android.inputmethod
   optional InputMethodConfig inputmethod_config = 139 [lazy = true];
 
+  // Data source name: qnx.kernel
+  optional QnxConfig qnx_config = 150 [lazy = true];
+
   // This is a fallback mechanism to send a free-form text config to the
   // producer. In theory this should never be needed. All the code that
   // is part of the platform (i.e. traced service) is supposed to *not* truncate

protos/perfetto/config/perfetto_config.proto

@@ -0,0 +1,20 @@
+# Copyright (C) 2019 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/proto_library.gni")
+
+perfetto_proto_library("@TYPE@") {
+  deps = [ "../../common:@TYPE@" ]
+  sources = [ "qnx_config.proto" ]
+}