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

Make timeout messages distinct

Browse source 
... so that we can confirm that it's actually the poll() call that's
timing out.

Bug: 332593241
Test: Treehugger
Change-Id: I529be76a268d7ba1f7f26a953eb84945f3ac4924
This commit is contained in:
Hans Boehm 2024-07-03 17:33:08 -07:00
parent 95a9a432be
commit d9d7f7a8c3
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();
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;
}