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

Commit 1fcae4f6 authored by Hans Boehm's avatar Hans Boehm Committed by Automerger Merge Worker
Browse files

Merge "Make timeout messages distinct" into main am: 1b251d44 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3160376



Change-Id: I244ec415204d140ee8b2a7b2921898498f0ef182
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents add6c534 1b251d44

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;

    }

    }