Skip to content

sdk: honor TraceConfig.compression_type on the in-process backend #5862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dreveman wants to merge 1 commit into
base: main
Choose a base branch
from
+56 −3
Open

sdk: honor TraceConfig.compression_type on the in-process backend #5862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions Android.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,6 +954,7 @@ cc_library {
":perfetto_src_tracing_ipc_producer_producer",
":perfetto_src_tracing_ipc_service_service",
":perfetto_src_tracing_service_service",
":perfetto_src_tracing_service_zlib_compressor",
":perfetto_src_tracing_system_backend",
],
host_supported: true,
Expand Down Expand Up @@ -1033,17 +1034,24 @@ cc_library {
cflags: [
"-DPERFETTO_REGEX_FORCE_STD",
"-DPERFETTO_SHLIB_SDK_IMPLEMENTATION",
"-DZLIB_IMPLEMENTATION",
],
min_sdk_version: "30",
target: {
android: {
shared_libs: [
"liblog",
"libz",
],
static_libs: [
"perfetto_flags_c_lib",
],
},
host: {
static_libs: [
"libz",
],
},
windows: {
enabled: true,
cflags: [
Expand Down Expand Up @@ -1168,6 +1176,7 @@ cc_library_static {
":perfetto_src_tracing_ipc_producer_producer",
":perfetto_src_tracing_ipc_service_service",
":perfetto_src_tracing_service_service",
":perfetto_src_tracing_service_zlib_compressor",
":perfetto_src_tracing_system_backend",
],
shared_libs: [
Expand Down Expand Up @@ -1317,6 +1326,7 @@ cc_library_static {
],
cflags: [
"-DPERFETTO_REGEX_FORCE_STD",
"-DZLIB_IMPLEMENTATION",
],
apex_available: [
"//apex_available:anyapex",
Expand All @@ -1325,10 +1335,18 @@ cc_library_static {
min_sdk_version: "30",
target: {
android: {
shared_libs: [
"libz",
],
static_libs: [
"perfetto_flags_c_lib",
],
},
host: {
static_libs: [
"libz",
],
},
},
}

Expand Down Expand Up @@ -2135,10 +2153,18 @@ cc_library_static {
],
target: {
android: {
shared_libs: [
"libz",
],
static_libs: [
"perfetto_flags_c_lib",
],
},
host: {
static_libs: [
"libz",
],
},
},
}

Expand Down Expand Up @@ -3134,6 +3160,7 @@ cc_test {
":perfetto_src_tracing_ipc_producer_relay",
":perfetto_src_tracing_ipc_service_service",
":perfetto_src_tracing_service_service",
":perfetto_src_tracing_service_zlib_compressor",
":perfetto_src_tracing_system_backend",
":perfetto_src_tracing_test_api_test_support",
":perfetto_src_tracing_test_client_api_integrationtests",
Expand Down Expand Up @@ -3348,10 +3375,18 @@ cc_test {
test_config: "PerfettoIntegrationTests.xml",
target: {
android: {
shared_libs: [
"libz",
],
static_libs: [
"perfetto_flags_c_lib",
],
},
host: {
static_libs: [
"libz",
],
},
},
}

Expand Down
6 changes: 4 additions & 2 deletions BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ perfetto_cc_library(
":src_tracing_ipc_producer_producer",
":src_tracing_ipc_service_service",
":src_tracing_service_service",
":src_tracing_service_zlib_compressor",
":src_tracing_system_backend",
],
hdrs = [
Expand Down Expand Up @@ -276,7 +277,7 @@ perfetto_cc_library(
":src_base_regex_regex",
":src_base_version",
":src_protovm_protovm",
],
] + PERFETTO_CONFIG.deps.zlib,
linkstatic = True,
)

Expand Down Expand Up @@ -9505,6 +9506,7 @@ perfetto_cc_library(
":src_tracing_ipc_producer_producer",
":src_tracing_ipc_service_service",
":src_tracing_service_service",
":src_tracing_service_zlib_compressor",
":src_tracing_system_backend",
],
hdrs = [
Expand Down Expand Up @@ -9595,7 +9597,7 @@ perfetto_cc_library(
":src_base_regex_regex",
":src_base_version",
":src_protovm_protovm",
],
] + PERFETTO_CONFIG.deps.zlib,
linkstatic = True,
)

Expand Down
3 changes: 3 additions & 0 deletions src/tracing/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@ source_set("in_process_backend") {
"core",
"service",
]
if (enable_perfetto_zlib) {
deps += [ "service:zlib_compressor" ]
}
sources = [ "internal/in_process_tracing_backend.cc" ]
}

Expand Down
15 changes: 14 additions & 1 deletion src/tracing/internal/in_process_tracing_backend.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@

#include "src/tracing/core/in_process_shared_memory.h"

#if PERFETTO_BUILDFLAG(PERFETTO_ZLIB)
#include "src/tracing/service/zlib_compressor.h"
#endif

// TODO(primiano): When the in-process backend is used, we should never end up
// in a situation where the thread where the TracingService and Producer live
// writes a packet and hence can get into the GetNewChunk() stall.
Expand Down Expand Up @@ -68,7 +72,16 @@ TracingService* InProcessTracingBackend::GetOrCreateService(
if (!service_) {
std::unique_ptr<InProcessSharedMemory::Factory> shm(
new InProcessSharedMemory::Factory());
service_ = TracingService::CreateInstance(std::move(shm), task_runner);
TracingService::InitOpts init_opts = {};
#if PERFETTO_BUILDFLAG(PERFETTO_ZLIB)
// Wire the zlib compressor so TraceConfig.compression_type =
// COMPRESSION_TYPE_DEFLATE takes effect on the in-process backend's
// service, mirroring what src/traced/service/service.cc does for the
// system backend.
init_opts.compressor_fn = &ZlibCompressFn;
#endif
service_ =
TracingService::CreateInstance(std::move(shm), task_runner, init_opts);
service_->SetSMBScrapingEnabled(true);
}
return service_.get();
Expand Down
Loading