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

Commit 61101be2 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "debuggerd_client: improve error logging." 

am: 0a8f6153

Change-Id: I5fa0de6d4f905ed6a3bb78aeab9600d71c2534e1
parents 2c6578f4 0a8f6153

debuggerd/client/debuggerd_client.cpp

+16 −8
Original line number Diff line number Diff line
@@ -143,11 +143,15 @@ bool debuggerd_trigger_dump(pid_t pid, DebuggerdDumpType dump_type, unsigned int 
  ssize_t rc =

      TEMP_FAILURE_RETRY(recv(set_timeout(sockfd.get()), &response, sizeof(response), MSG_TRUNC));

  if (rc == 0) {

    LOG(ERROR) << "libdebuggerd_client: failed to read response from tombstoned: timeout reached?";

    LOG(ERROR) << "libdebuggerd_client: failed to read initial response from tombstoned: "

               << "timeout reached?";

    return false;

  } else if (rc == -1) {

    PLOG(ERROR) << "libdebuggerd_client: failed to read initial response from tombstoned";

    return false;

  } else if (rc != sizeof(response)) {

    LOG(ERROR)

        << "libdebuggerd_client: received packet of unexpected length from tombstoned: expected "

    LOG(ERROR) << "libdebuggerd_client: received packet of unexpected length from tombstoned while "

                  "reading initial response: expected "

               << sizeof(response) << ", received " << rc;

    return false;

  }
@@ -164,11 +168,15 @@ bool debuggerd_trigger_dump(pid_t pid, DebuggerdDumpType dump_type, unsigned int 


  rc = TEMP_FAILURE_RETRY(recv(set_timeout(sockfd.get()), &response, sizeof(response), MSG_TRUNC));

  if (rc == 0) {

    LOG(ERROR) << "libdebuggerd_client: failed to read response from tombstoned: timeout reached?";

    LOG(ERROR) << "libdebuggerd_client: failed to read status response from tombstoned: "

                  "timeout reached?";

    return false;

  } else if (rc == -1) {

    PLOG(ERROR) << "libdebuggerd_client: failed to read status response from tombstoned";

    return false;

  } else if (rc != sizeof(response)) {

    LOG(ERROR)

      << "libdebuggerd_client: received packet of unexpected length from tombstoned: expected "

    LOG(ERROR) << "libdebuggerd_client: received packet of unexpected length from tombstoned while "

                  "reading confirmation response: expected "

               << sizeof(response) << ", received " << rc;

    return false;

  }