Prevent traced from blocking on a unresponsive producer.
Previously traced would block indefinitely if a producer
stop draining the IPC channel. This would result in eventually
the sendmsg call blocking and android's Watchdog killing traced
for being unresponsive, if some producer in a long trace was
unresponsive.
We add an integration test which exposed this issue to prevent
regressions, and set a timeout on the producer sockets and disconnect
the producer on timeouts.
We don't set the timeout on the consumer socket on the assumption
that the consumer is trusted and to minimize changes to our
behaviour as S is finalizing.
Bug: 169051440
Change-Id: I63988f79b63977ae27eedd126a2bbdcaaa520e78
diff --git a/test/test_helper.cc b/test/test_helper.cc
index 2ffdd8c..b3000b5 100644
--- a/test/test_helper.cc
+++ b/test/test_helper.cc
@@ -56,6 +56,7 @@
void TestHelper::OnTracingDisabled(const std::string& /*error*/) {
std::move(on_stop_tracing_callback_)();
+ on_stop_tracing_callback_ = nullptr;
}
void TestHelper::OnTraceData(std::vector<TracePacket> packets, bool has_more) {
@@ -141,8 +142,10 @@
void TestHelper::StartTracing(const TraceConfig& config,
base::ScopedFile file) {
+ PERFETTO_CHECK(!on_stop_tracing_callback_);
trace_.clear();
- on_stop_tracing_callback_ = CreateCheckpoint("stop.tracing");
+ on_stop_tracing_callback_ =
+ CreateCheckpoint("stop.tracing" + std::to_string(++trace_count_));
endpoint_->EnableTracing(config, std::move(file));
}
@@ -164,6 +167,10 @@
endpoint_->ReadBuffers();
}
+void TestHelper::FreeBuffers() {
+ endpoint_->FreeBuffers();
+}
+
void TestHelper::WaitForConsumerConnect() {
RunUntilCheckpoint("consumer.connected." + std::to_string(cur_consumer_num_));
}
@@ -177,7 +184,8 @@
}
void TestHelper::WaitForTracingDisabled(uint32_t timeout_ms) {
- RunUntilCheckpoint("stop.tracing", timeout_ms);
+ RunUntilCheckpoint(std::string("stop.tracing") + std::to_string(trace_count_),
+ timeout_ms);
}
void TestHelper::WaitForReadData(uint32_t read_count, uint32_t timeout_ms) {
