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

Commit 5f87bbdb authored by Josh Gao's avatar Josh Gao
Browse files

debuggerd: switch to base::{Send,Receive}FileDescriptors. 

Bug: http://b/12204763
Test: debuggerd_test
Change-Id: I0be40916214de51ab36fd6bd6d44090a84312e51
parent 14f9500a

debuggerd/client/debuggerd_client.cpp

+6 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <chrono>



#include <android-base/cmsg.h>

#include <android-base/file.h>

#include <android-base/logging.h>

#include <android-base/parseint.h>
@@ -41,6 +42,7 @@ 


using namespace std::chrono_literals;



using android::base::SendFileDescriptors;

using android::base::unique_fd;



static bool send_signal(pid_t pid, const DebuggerdDumpType dump_type) {
@@ -146,15 +148,16 @@ bool debuggerd_trigger_dump(pid_t tid, DebuggerdDumpType dump_type, unsigned int 
    PLOG(ERROR) << "failed to set pipe buffer size";

  }



  if (send_fd(set_timeout(sockfd), &req, sizeof(req), std::move(pipe_write)) != sizeof(req)) {

  ssize_t rc = SendFileDescriptors(set_timeout(sockfd), &req, sizeof(req), pipe_write.get());

  pipe_write.reset();

  if (rc != sizeof(req)) {

    PLOG(ERROR) << "libdebuggerd_client: failed to send output fd to tombstoned";

    return false;

  }



  // Check to make sure we've successfully registered.

  InterceptResponse response;

  ssize_t rc =

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

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

  if (rc == 0) {

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

               << "timeout reached?";

debuggerd/debuggerd_test.cpp

+7 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <android/fdsan.h>

#include <android/set_abort_message.h>



#include <android-base/cmsg.h>

#include <android-base/file.h>

#include <android-base/logging.h>

#include <android-base/macros.h>
@@ -53,6 +54,8 @@ 
#include "util.h"



using namespace std::chrono_literals;



using android::base::SendFileDescriptors;

using android::base::unique_fd;



#if defined(__LP64__)
@@ -123,12 +126,14 @@ static void tombstoned_intercept(pid_t target_pid, unique_fd* intercept_fd, uniq 


  ASSERT_GE(pipe_buffer_size, 1024 * 1024);



  if (send_fd(intercept_fd->get(), &req, sizeof(req), std::move(output_pipe_write)) != sizeof(req)) {

  ssize_t rc = SendFileDescriptors(intercept_fd->get(), &req, sizeof(req), output_pipe_write.get());

  output_pipe_write.reset();

  if (rc != sizeof(req)) {

    FAIL() << "failed to send output fd to tombstoned: " << strerror(errno);

  }



  InterceptResponse response;

  ssize_t rc = TEMP_FAILURE_RETRY(read(intercept_fd->get(), &response, sizeof(response)));

  rc = TEMP_FAILURE_RETRY(read(intercept_fd->get(), &response, sizeof(response)));

  if (rc == -1) {

    FAIL() << "failed to read response from tombstoned: " << strerror(errno);

  } else if (rc == 0) {

debuggerd/tombstoned/intercept_manager.cpp

+4 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <event2/event.h>

#include <event2/listener.h>



#include <android-base/cmsg.h>

#include <android-base/logging.h>

#include <android-base/unique_fd.h>

#include <cutils/sockets.h>
@@ -31,6 +32,7 @@ 
#include "protocol.h"

#include "util.h"



using android::base::ReceiveFileDescriptors;

using android::base::unique_fd;



static void intercept_close_cb(evutil_socket_t sockfd, short event, void* arg) {
@@ -96,7 +98,8 @@ static void intercept_request_cb(evutil_socket_t sockfd, short ev, void* arg) { 
  {

    unique_fd rcv_fd;

    InterceptRequest intercept_request;

    ssize_t result = recv_fd(sockfd, &intercept_request, sizeof(intercept_request), &rcv_fd);

    ssize_t result =

        ReceiveFileDescriptors(sockfd, &intercept_request, sizeof(intercept_request), &rcv_fd);



    if (result == -1) {

      PLOG(WARNING) << "failed to read from intercept socket";

debuggerd/tombstoned/tombstoned.cpp

+6 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <event2/listener.h>

#include <event2/thread.h>



#include <android-base/cmsg.h>

#include <android-base/logging.h>

#include <android-base/properties.h>

#include <android-base/stringprintf.h>
@@ -45,6 +46,7 @@ 
#include "intercept_manager.h"



using android::base::GetIntProperty;

using android::base::SendFileDescriptors;

using android::base::StringPrintf;

using android::base::unique_fd;
@@ -224,7 +226,10 @@ static void perform_request(Crash* crash) { 
  TombstonedCrashPacket response = {

    .packet_type = CrashPacketType::kPerformDump

  };

  ssize_t rc = send_fd(crash->crash_socket_fd, &response, sizeof(response), std::move(output_fd));

  ssize_t rc =

      SendFileDescriptors(crash->crash_socket_fd, &response, sizeof(response), output_fd.get());

  output_fd.reset();



  if (rc == -1) {

    PLOG(WARNING) << "failed to send response to CrashRequest";

    goto fail;

debuggerd/tombstoned/tombstoned_client.cpp

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include <utility>



#include <android-base/cmsg.h>

#include <android-base/unique_fd.h>

#include <async_safe/log.h>

#include <cutils/sockets.h>
@@ -28,6 +29,7 @@ 
#include "protocol.h"

#include "util.h"



using android::base::ReceiveFileDescriptors;

using android::base::unique_fd;



bool tombstoned_connect(pid_t pid, unique_fd* tombstoned_socket, unique_fd* output_fd,
@@ -53,7 +55,7 @@ bool tombstoned_connect(pid_t pid, unique_fd* tombstoned_socket, unique_fd* outp 
  }



  unique_fd tmp_output_fd;

  ssize_t rc = recv_fd(sockfd, &packet, sizeof(packet), &tmp_output_fd);

  ssize_t rc = ReceiveFileDescriptors(sockfd, &packet, sizeof(packet), &tmp_output_fd);

  if (rc == -1) {

    async_safe_format_log(ANDROID_LOG_ERROR, "libc",

                          "failed to read response to DumpRequest packet: %s", strerror(errno));