Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9d7f7a8 authored by Hans Boehm's avatar Hans Boehm
Browse files

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
parent 95a9a432

debuggerd/client/debuggerd_client.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -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;

    }

    }