Mac: Add support for in-process crash reporting

client/mac/Framework/Breakpad.mm

Index: client/mac/Framework/Breakpad.mm
diff --git a/client/mac/Framework/Breakpad.mm b/client/mac/Framework/Breakpad.mm
index fe592bf39f071157985daf2a4a0bcb28cba0d879..791326307e72df085dec6a9d683cfe2b02e8709e 100644
--- a/client/mac/Framework/Breakpad.mm
+++ b/client/mac/Framework/Breakpad.mm
@@ -44,6 +44,7 @@
 #import "client/mac/Framework/Breakpad.h"
 #import "client/mac/Framework/OnDemandServer.h"
 #import "client/mac/handler/protected_memory_allocator.h"
+#include "common/mac/launch_reporter.h"
 #import "common/mac/MachIPC.h"
 #import "common/simple_string_dictionary.h"
 
@@ -173,6 +174,8 @@ class Breakpad {
   }
 
   bool Initialize(NSDictionary *parameters);
+  bool InitializeInProcess(NSDictionary *parameters);
+  bool InitializeOutOfProcess(NSDictionary *parameters);
 
   bool ExtractParameters(NSDictionary *parameters);
 
@@ -188,6 +191,16 @@ class Breakpad {
                        int exception_subcode,
                        mach_port_t crashing_thread);
 
+  // Dispatches to HandleMinidump().
+  // This gets called instead of ExceptionHandlerDirectCallback when running
+  // with the BREAKPAD_IN_PROCESS option.
+  static bool HandleMinidumpCallback(const char *dump_dir,
+                                     const char *minidump_id,
+                                     void *context, bool succeeded);

[Mark Mentovai, 2014/09/15 13:38:44]

If you have to break parameters up to take more than one line, you should put
each parameter on its own line, otherwise the last two melt into one another.

[Andre, 2014/09/15 17:42:39]

Done.

+
+  bool HandleMinidump(const char *dump_dir,

[Mark Mentovai, 2014/09/15 13:38:44]

This should also have a comment explaining that it’s only used with
BREAKPAD_IN_PROCESS.

It might be better to name it more descriptively, like
WriteMinidumpInProcessAndLaunchReporter().

[Andre, 2014/09/15 17:42:39]

Done.
This method does not actually write the minidump file (the minidump was already
written by
ExceptionHandler before this callback in invoked), so WriteMinidump may not be a
good name.
I'm leaning towards keeping the name HandleMinidump (and it matches iOS
breakpad), WDYT?

+                      const char *minidump_id);

[Mark Mentovai, 2014/09/15 13:38:44]

Nit (may be irrelevant if the method is renamed): it doesn’t look like you
actually needed to put this one on its own line at all.

[Andre, 2014/09/15 17:42:39]

Done.

+
   // Since ExceptionHandler (w/o namespace) is defined as typedef in OSX's
   // MachineExceptions.h, we have to explicitly name the handler.
   google_breakpad::ExceptionHandler *handler_; // The actual handler (STRONG)
@@ -266,6 +279,20 @@ bool Breakpad::ExceptionHandlerDirectCallback(void *context,
 }
 
 //=============================================================================
+bool Breakpad::HandleMinidumpCallback(const char *dump_dir,
+                                      const char *minidump_id,
+                                      void *context, bool succeeded) {

[Mark Mentovai, 2014/09/15 13:38:44]

As above.

[Andre, 2014/09/15 17:42:39]

Done.

+  Breakpad *breakpad = (Breakpad *)context;
+
+  // If our context is damaged or something, just return false to indicate that
+  // the handler should continue without us.
+  if (!breakpad || !succeeded)
+    return false;
+
+  return breakpad->HandleMinidump(dump_dir, minidump_id);
+}
+
+//=============================================================================
 #pragma mark -
 
 #include <dlfcn.h>
@@ -326,6 +353,25 @@ bool Breakpad::Initialize(NSDictionary *parameters) {
     return false;
   }
 
+  if ([[parameters objectForKey:@BREAKPAD_IN_PROCESS] boolValue])
+    return InitializeInProcess(parameters);
+  else
+    return InitializeOutOfProcess(parameters);
+}
+
+//=============================================================================
+bool Breakpad::InitializeInProcess(NSDictionary* parameters) {
+  handler_ =
+      new (gBreakpadAllocator->Allocate(
+          sizeof(google_breakpad::ExceptionHandler)))
+          google_breakpad::ExceptionHandler(
+              config_params_->GetValueForKey(BREAKPAD_DUMP_DIRECTORY),
+              0, &HandleMinidumpCallback, this, true, 0);
+  return true;    
+}
+
+//=============================================================================
+bool Breakpad::InitializeOutOfProcess(NSDictionary* parameters) {
   // Get path to Inspector executable.
   NSString *inspectorPathString = KeyValue(@BREAKPAD_INSPECTOR_LOCATION);
 
@@ -711,6 +757,17 @@ bool Breakpad::HandleException(int exception_type,
 }
 
 //=============================================================================
+bool Breakpad::HandleMinidump(const char *dump_dir,
+                              const char *minidump_id) {
+  google_breakpad::ConfigFile config_file;
+  config_file.WriteFile(dump_dir, config_params_, dump_dir, minidump_id);
+  google_breakpad::LaunchReporter(
+      config_params_->GetValueForKey(BREAKPAD_REPORTER_EXE_LOCATION),
+      config_file.GetFilePath());
+  return true;
+}
+
+//=============================================================================
 //=============================================================================
 
 #pragma mark -