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

Commit 8b951f5a authored by Josh Gao's avatar Josh Gao Committed by Gerrit Code Review
Browse files

Merge changes Ib8369088,I743433bc 

* changes:
  debuggerd_test: remove useless pipe.
  debuggerd_client: fix infinite timeouts.
parents 7bbd2a52 951cf700

debuggerd/client/debuggerd_client.cpp

+12 −7
Original line number Diff line number Diff line
@@ -58,28 +58,31 @@ static void populate_timeval(struct timeval* tv, const Duration& duration) { 
}



bool debuggerd_trigger_dump(pid_t pid, unique_fd output_fd, DebuggerdDumpType dump_type,

                            int timeout_ms) {

                            unsigned int timeout_ms) {

  LOG(INFO) << "libdebuggerd_client: started dumping process " << pid;

  unique_fd sockfd;

  const auto end = std::chrono::steady_clock::now() + std::chrono::milliseconds(timeout_ms);

  auto time_left = [timeout_ms, &end]() { return end - std::chrono::steady_clock::now(); };

  auto time_left = [&end]() { return end - std::chrono::steady_clock::now(); };

  auto set_timeout = [timeout_ms, &time_left](int sockfd) {

    if (timeout_ms <= 0) {

      return -1;

      return sockfd;

    }



    auto remaining = time_left();

    if (remaining < decltype(remaining)::zero()) {

      LOG(ERROR) << "timeout expired";

      LOG(ERROR) << "libdebuggerd_client: timeout expired";

      return -1;

    }



    struct timeval timeout;

    populate_timeval(&timeout, remaining);



    if (setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)) != 0) {

      PLOG(ERROR) << "libdebuggerd_client: failed to set receive timeout";

      return -1;

    }

    if (setsockopt(sockfd, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout)) != 0) {

      PLOG(ERROR) << "libdebuggerd_client: failed to set send timeout";

      return -1;

    }
@@ -158,8 +161,10 @@ bool debuggerd_trigger_dump(pid_t pid, unique_fd output_fd, DebuggerdDumpType du 


  // Forward output from the pipe to the output fd.

  while (true) {

    auto remaining_ms = std::chrono::duration_cast<std::chrono::milliseconds>(time_left());

    if (remaining_ms <= 1ms) {

    auto remaining_ms = std::chrono::duration_cast<std::chrono::milliseconds>(time_left()).count();

    if (timeout_ms <= 0) {

      remaining_ms = -1;

    } else if (remaining_ms < 0) {

      LOG(ERROR) << "libdebuggerd_client: timeout expired";

      return false;

    }
@@ -168,7 +173,7 @@ bool debuggerd_trigger_dump(pid_t pid, unique_fd output_fd, DebuggerdDumpType du 
        .fd = pipe_read.get(), .events = POLLIN, .revents = 0,

    };



    rc = poll(&pfd, 1, remaining_ms.count());

    rc = poll(&pfd, 1, remaining_ms);

    if (rc == -1) {

      if (errno == EINTR) {

        continue;

debuggerd/client/debuggerd_client_test.cpp

+20 −0
Original line number Diff line number Diff line
@@ -89,3 +89,23 @@ TEST(debuggerd_client, race) { 


  EXPECT_EQ(1, found_end) << "\nOutput: \n" << result;

}



TEST(debuggerd_client, no_timeout) {

  unique_fd pipe_read, pipe_write;

  ASSERT_TRUE(Pipe(&pipe_read, &pipe_write));



  pid_t forkpid = fork();

  ASSERT_NE(-1, forkpid);

  if (forkpid == 0) {

    pipe_write.reset();

    char dummy;

    TEMP_FAILURE_RETRY(read(pipe_read.get(), &dummy, sizeof(dummy)));

    exit(0);

  }



  pipe_read.reset();



  unique_fd output_read, output_write;

  ASSERT_TRUE(Pipe(&output_read, &output_write));

  ASSERT_TRUE(debuggerd_trigger_dump(forkpid, std::move(output_write), kDebuggerdBacktrace, 0));

}

debuggerd/debuggerd_test.cpp

+0 −3
Original line number Diff line number Diff line
@@ -500,9 +500,6 @@ TEST_F(CrasherTest, capabilities) { 
TEST(crash_dump, zombie) {

  pid_t forkpid = fork();



  int pipefd[2];

  ASSERT_EQ(0, pipe2(pipefd, O_CLOEXEC));



  pid_t rc;

  int status;

debuggerd/include/debuggerd/client.h

+2 −2
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ enum DebuggerdDumpType { 
};



// Trigger a dump of specified process to output_fd.

// output_fd is *not* consumed, timeouts <= 0 will wait forever.

// output_fd is consumed, timeout of 0 will wait forever.

bool debuggerd_trigger_dump(pid_t pid, android::base::unique_fd output_fd,

                            enum DebuggerdDumpType dump_type, int timeout_ms);

                            enum DebuggerdDumpType dump_type, unsigned int timeout_ms);



int dump_backtrace_to_file(pid_t tid, int fd);

int dump_backtrace_to_file_timeout(pid_t tid, int fd, int timeout_secs);