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

Commit fb5eac94 authored by Peter Collingbourne's avatar Peter Collingbourne
Browse files

Add support for a hw_timeout_multiplier system property. 

In order to test the platform in emulators that are orders of magnitude
slower than real hardware we need to be able to avoid hitting timeouts
that prevent it from coming up properly. For this purpose introduce
a system property, ro.hw_timeout_multiplier, which may be set to
an integer value that acts as a multiplier for various timeouts on
the system.

Bug: 178231152
Change-Id: I6d7710beed0c4c5b1720e74e7abe3a586778c678
Merged-In: I6d7710beed0c4c5b1720e74e7abe3a586778c678
parent d5bd5437

debuggerd/crash_dump.cpp

+3 −3
Original line number Diff line number Diff line
@@ -153,14 +153,14 @@ static bool activity_manager_notify(pid_t pid, int signal, const std::string& am 
  }



  struct timeval tv = {

      .tv_sec = 1 * android::base::TimeoutMultiplier(),

      .tv_sec = 1 * android::base::HwTimeoutMultiplier(),

      .tv_usec = 0,

  };

  if (setsockopt(amfd.get(), SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)) == -1) {

    PLOG(ERROR) << "failed to set send timeout on activity manager socket";

    return false;

  }

  tv.tv_sec = 3 * android::base::TimeoutMultiplier();  // 3 seconds on handshake read

  tv.tv_sec = 3 * android::base::HwTimeoutMultiplier();  // 3 seconds on handshake read

  if (setsockopt(amfd.get(), SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) == -1) {

    PLOG(ERROR) << "failed to set receive timeout on activity manager socket";

    return false;
@@ -448,7 +448,7 @@ int main(int argc, char** argv) { 
  //

  // Note: processes with many threads and minidebug-info can take a bit to

  //       unwind, do not make this too small. b/62828735

  alarm(30 * android::base::TimeoutMultiplier());

  alarm(30 * android::base::HwTimeoutMultiplier());



  // Get the process name (aka cmdline).

  std::string process_name = get_process_name(g_target_thread);

debuggerd/tombstoned/intercept_manager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static void intercept_request_cb(evutil_socket_t sockfd, short ev, void* arg) { 
    event_assign(intercept->intercept_event, intercept_manager->base, sockfd, EV_READ | EV_TIMEOUT,

                 intercept_close_cb, arg);



    struct timeval timeout = {.tv_sec = 10 * android::base::TimeoutMultiplier(), .tv_usec = 0};

    struct timeval timeout = {.tv_sec = 10 * android::base::HwTimeoutMultiplier(), .tv_usec = 0};

    event_add(intercept->intercept_event, &timeout);

  }
@@ -179,7 +179,7 @@ static void intercept_accept_cb(evconnlistener* listener, evutil_socket_t sockfd 
  intercept->intercept_manager = static_cast<InterceptManager*>(arg);

  intercept->sockfd.reset(sockfd);



  struct timeval timeout = {1 * android::base::TimeoutMultiplier(), 0};

  struct timeval timeout = {1 * android::base::HwTimeoutMultiplier(), 0};

  event_base* base = evconnlistener_get_base(listener);

  event* intercept_event =

    event_new(base, sockfd, EV_TIMEOUT | EV_READ, intercept_request_cb, intercept);

debuggerd/tombstoned/tombstoned.cpp

+2 −2
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static void perform_request(std::unique_ptr<Crash> crash) { 
  }



  // TODO: Make this configurable by the interceptor?

  struct timeval timeout = {10 * android::base::TimeoutMultiplier(), 0};

  struct timeval timeout = {10 * android::base::HwTimeoutMultiplier(), 0};



  event_base* base = event_get_base(crash->crash_event);
@@ -340,7 +340,7 @@ static void crash_accept_cb(evconnlistener* listener, evutil_socket_t sockfd, so 


  // TODO: Make sure that only java crashes come in on the java socket

  // and only native crashes on the native socket.

  struct timeval timeout = {1 * android::base::TimeoutMultiplier(), 0};

  struct timeval timeout = {1 * android::base::HwTimeoutMultiplier(), 0};

  event* crash_event = event_new(base, sockfd, EV_TIMEOUT | EV_READ, crash_request_cb, crash);

  crash->crash_socket_fd.reset(sockfd);

  crash->crash_event = crash_event;

llkd/libllkd.cpp

+2 −1
Original line number Diff line number Diff line
@@ -962,7 +962,8 @@ milliseconds llkCheck(bool checkRunning) { 
    //

    // This alarm is effectively the live lock detection of llkd, as

    // we understandably can not monitor ourselves otherwise.

    ::alarm(duration_cast<seconds>(llkTimeoutMs * 2 * android::base::TimeoutMultiplier()).count());

    ::alarm(duration_cast<seconds>(llkTimeoutMs * 2 * android::base::HwTimeoutMultiplier())

                    .count());



    // kernel jiffy precision fastest acquisition

    static timespec last;