commit 1b251d441e05629ea6881c03a5a0ec576d4b7e71
author Hans Boehm <hboehm@google.com> Mon Jul 08 18:19:33 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 08 18:19:33 2024 +0000
tree 3a7474154b1f9ba49190ed64bd4b2b27a0e937ea
parent e563c3f48a2478ea909f2fe08790e53bc7787b70
parent d9d7f7a8c3fe8e20bf32419fa3939c0cbfce283b

Merge "Make timeout messages distinct" into main

debuggerd/client/debuggerd_client.cpp

diff --git a/debuggerd/client/debuggerd_client.cpp b/debuggerd/client/debuggerd_client.cpp
index af1bb81..632f6f1 100644
--- a/debuggerd/client/debuggerd_client.cpp
+++ b/debuggerd/client/debuggerd_client.cpp
@@ -138,7 +138,7 @@
 
     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 @@
     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 @@
         return false;
       }
     } else if (rc == 0) {
-      log_error(output_fd, 0, "timeout expired");
+      log_error(output_fd, 0, "poll timeout expired");
       return false;
     }