Mac: Add support for in-process crash reporting

common/mac/launch_reporter.cc

Index: common/mac/launch_reporter.cc
diff --git a/client/mac/crash_generation/InspectorMain.mm b/common/mac/launch_reporter.cc
similarity index 60%
copy from client/mac/crash_generation/InspectorMain.mm
copy to common/mac/launch_reporter.cc
index 137c6a1e1bbf550012963705bd4a241fc68dd8be..4502730b6ddcf008c8e9bb9f523c6f46f0c985cc 100644
--- a/client/mac/crash_generation/InspectorMain.mm
+++ b/common/mac/launch_reporter.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2007, Google Inc.
+// Copyright (c) 2014, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -26,40 +26,51 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Main driver for Inspector
 
-#import "client/mac/crash_generation/Inspector.h"
-#import <Cocoa/Cocoa.h>
+#include <sys/wait.h>
+#include <unistd.h>
 
 namespace google_breakpad {
 
-//=============================================================================
-extern "C" {
-
-int main(int argc, char *const argv[]) {
-#if DEBUG
-  // Since we're launched on-demand, this is necessary to see debugging
-  // output in the console window.
-  freopen("/dev/console", "w", stdout);
-  freopen("/dev/console", "w", stderr);
-#endif
+void LaunchReporter(const char *reporterExecutablePath,
+                    const char *configFilePath) {
+                    const char *argv[3];

[Mark Mentovai, 2014/09/12 21:58:21]

Don’t line this up with the parameters: that makes it look like a parameter too.

const char* argv[] = { reporterExecutablePath, configFilePath, NULL }; is a
little cleaner than this, too.

[Andre, 2014/09/12 22:59:40]

Done.

+  argv[0] = reporterExecutablePath;
+  argv[1] = configFilePath;
+  argv[2] = NULL;
 
-  NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+  // Launch the reporter
+  pid_t pid = fork();
 
-  if (argc != 2) {
-    exit(0);
+  // If we're in the child, load in our new executable and run.
+  // The parent will not wait for the child to complete.
+  if (pid == 0) {
+    execv(argv[0], (char * const *)argv);
+    unlink(configFilePath);  // launch failed - get rid of config file

[Mark Mentovai, 2014/09/12 21:58:21]

fprintf something to stderr here about exec’s failure, too?

[Andre, 2014/09/12 22:59:40]

Done.

+    _exit(1);
   }
-  // Our first command-line argument contains the name of the service
-  // that we're providing.
-  google_breakpad::Inspector inspector;
-  inspector.Inspect(argv[1]);
 
-  [pool release];
+  // Wait until the Reporter child process exits.
+  //
 
-  return 0;
-}
+  // We'll use a timeout of one minute.
+  int timeoutCount = 60;   // 60 seconds
 
-} // extern "C"
+  while (timeoutCount-- > 0) {
+    int status;
+    pid_t result = waitpid(pid, &status, WNOHANG);

[Mark Mentovai, 2014/09/12 21:58:21]

I know that this is old code that you’re just moving, but it’s kind of weird…but
since it’s old code, I guess it’s all right. We’re not looking to reinvent the
world here.

[Andre, 2014/09/12 22:59:40]

Acknowledged.

+
+    if (result == 0) {
+      // The child has not yet finished.
+      sleep(1);
+    } else if (result == -1) {
+      // error occurred.
+      break;
+    } else {
+      // child has finished
+      break;
+    }
+  }
+}
 
 } // namespace google_breakpad