ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Make timeout messages distinct" into main

Browse source
This commit is contained in:
Hans Boehm 2024-07-08 18:19:33 +00:00 • committed by Gerrit Code Review
commit 1b251d441e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debuggerd/client/debuggerd_client.cpp
View file

@ -138,7 +138,7 @@ bool debuggerd_trigger_dump(pid_t tid, DebuggerdDumpType dump_type, unsigned int
auto remaining = end - std::chrono::steady_clock::now(); auto remaining = end - std::chrono::steady_clock::now();
if (remaining < decltype(remaining)::zero()) { if (remaining < decltype(remaining)::zero()) {
log_error(output_fd, 0, "timeout expired"); log_error(output_fd, 0, "timeout expired (update_timeout)");
return false; return false;
} }
@ -254,7 +254,7 @@ bool debuggerd_trigger_dump(pid_t tid, DebuggerdDumpType dump_type, unsigned int
if (timeout_ms <= 0) { if (timeout_ms <= 0) {
remaining_ms = -1; remaining_ms = -1;
} else if (remaining_ms < 0) { } else if (remaining_ms < 0) {
log_error(output_fd, 0, "timeout expired"); log_error(output_fd, 0, "timeout expired before poll");
return false; return false;
} }
@ -271,7 +271,7 @@ bool debuggerd_trigger_dump(pid_t tid, DebuggerdDumpType dump_type, unsigned int
return false; return false;
} }
} else if (rc == 0) { } else if (rc == 0) {
log_error(output_fd, 0, "timeout expired"); log_error(output_fd, 0, "poll timeout expired");
return false; return false;
} }