From d9d7f7a8c3fe8e20bf32419fa3939c0cbfce283b Mon Sep 17 00:00:00 2001 From: Hans Boehm Date: Wed, 3 Jul 2024 17:33:08 -0700 Subject: [PATCH] Make timeout messages distinct ... so that we can confirm that it's actually the poll() call that's timing out. Bug: 332593241 Test: Treehugger Change-Id: I529be76a268d7ba1f7f26a953eb84945f3ac4924 --- debuggerd/client/debuggerd_client.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debuggerd/client/debuggerd_client.cpp b/debuggerd/client/debuggerd_client.cpp index af1bb8181..632f6f1c9 100644 --- a/debuggerd/client/debuggerd_client.cpp +++ b/debuggerd/client/debuggerd_client.cpp @@ -138,7 +138,7 @@ bool debuggerd_trigger_dump(pid_t tid, DebuggerdDumpType dump_type, unsigned int auto remaining = end - std::chrono::steady_clock::now(); if (remaining < decltype(remaining)::zero()) { - log_error(output_fd, 0, "timeout expired"); + log_error(output_fd, 0, "timeout expired (update_timeout)"); return false; } @@ -254,7 +254,7 @@ bool debuggerd_trigger_dump(pid_t tid, DebuggerdDumpType dump_type, unsigned int if (timeout_ms <= 0) { remaining_ms = -1; } else if (remaining_ms < 0) { - log_error(output_fd, 0, "timeout expired"); + log_error(output_fd, 0, "timeout expired before poll"); return false; } @@ -271,7 +271,7 @@ bool debuggerd_trigger_dump(pid_t tid, DebuggerdDumpType dump_type, unsigned int return false; } } else if (rc == 0) { - log_error(output_fd, 0, "timeout expired"); + log_error(output_fd, 0, "poll timeout expired"); return false; }