From ee58effe14addea2b6a7a14b54b80bd6e5fb37cc Mon Sep 17 00:00:00 2001
From: Mark Mentovai <mark@chromium.org>
Date: Mon, 9 Nov 2015 15:57:46 -0500
Subject: [PATCH] mac: Log a message when restarting crashpad_handler
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is unexpected and important enough that the restart shouldn’t
happen silently.

BUG=crashpad:68
R=rsesek@chromium.org

Review URL: https://codereview.chromium.org/1411313007 .
---
 client/crashpad_client_mac.cc | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/client/crashpad_client_mac.cc b/client/crashpad_client_mac.cc
index d5e3545b..480828be 100644
--- a/client/crashpad_client_mac.cc
+++ b/client/crashpad_client_mac.cc
@@ -164,7 +164,8 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
       return base::mac::ScopedMachSendRight();
     }
 
-    if (handler_restarter && handler_restarter->StartRestartThread(
+    if (handler_restarter &&
+        handler_restarter->StartRestartThread(
             handler, database, url, annotations, arguments)) {
       // The thread owns the object now.
       ignore_result(handler_restarter.release());
@@ -245,6 +246,8 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                           base::mac::ScopedMachReceiveRight receive_right,
                           HandlerStarter* handler_restarter,
                           bool restart) {
+    DCHECK(!restart || handler_restarter);
+
     if (handler_restarter) {
       // The port-destroyed notification must be requested each time. It uses
       // a send-once right, so once the notification is received, it won’t be
@@ -270,7 +273,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
         DCHECK(restart || !previous_owner.is_valid());
       }
 
-      if (handler_restarter->last_start_time_) {
+      if (restart) {
         // If the handler was ever started before, don’t restart it too quickly.
         const uint64_t kNanosecondsPerSecond = 1E9;
         const uint64_t kMinimumStartInterval = 1 * kNanosecondsPerSecond;
@@ -279,7 +282,14 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
             handler_restarter->last_start_time_ + kMinimumStartInterval;
         const uint64_t now_time = ClockMonotonicNanoseconds();
         if (earliest_next_start_time > now_time) {
+          const uint64_t sleep_time = earliest_next_start_time - now_time;
+          LOG(INFO) << "restarting handler"
+                    << base::StringPrintf(" in %.3fs",
+                                          static_cast<double>(sleep_time) /
+                                              kNanosecondsPerSecond);
           SleepNanoseconds(earliest_next_start_time - now_time);
+        } else {
+          LOG(INFO) << "restarting handler";
         }
       }
 
@@ -517,13 +527,13 @@ bool CrashpadClient::StartHandler(
   // The “restartable” behavior can only be selected on OS X 10.10 and later. In
   // previous OS versions, if the initial client were to crash while attempting
   // to restart the handler, it would become an unkillable process.
-  base::mac::ScopedMachSendRight exception_port(HandlerStarter::InitialStart(
-      handler,
-      database,
-      url,
-      annotations,
-      arguments,
-      restartable && MacOSXMinorVersion() >= 10));
+  base::mac::ScopedMachSendRight exception_port(
+      HandlerStarter::InitialStart(handler,
+                                   database,
+                                   url,
+                                   annotations,
+                                   arguments,
+                                   restartable && MacOSXMinorVersion() >= 10));
   if (!exception_port.is_valid()) {
     return false;
   }