Mac: Add support for in-process crash reporting

client/mac/crash_generation/Inspector.mm

 // Copyright (c) 2007, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 25 matching lines @@
 #include <string.h>
 #include <string>
 
 #import "client/mac/crash_generation/Inspector.h"
 
 #import "client/mac/Framework/Breakpad.h"
 #import "client/mac/handler/minidump_generator.h"
 
 #import "common/mac/MachIPC.h"
 #include "common/mac/bootstrap_compat.h"
+#include "common/mac/launch_reporter.h"
 
 #import "GTMDefines.h"
 
 #import <Foundation/Foundation.h>
 
 namespace google_breakpad {
 
 //=============================================================================
 void Inspector::Inspect(const char *receive_port_name) {
   kern_return_t result = ResetBootstrapPort();
@@ skipping 13 matching lines @@
       // Send acknowledgement to the crashed process that the inspection
       // has finished.  It will then be able to cleanly exit.
       // The return value is ignored because failure isn't fatal. If the process
       // didn't get the message there's nothing we can do, and we still want to
       // send the report.
       SendAcknowledgement();
 
       if (wrote_minidump) {
         // Ask the user if he wants to upload the crash report to a server,
         // and do so if he agrees.
-        LaunchReporter(config_file_.GetFilePath());
+        LaunchReporter(
+            config_params_.GetValueForKey(BREAKPAD_REPORTER_EXE_LOCATION),
+            config_file_.GetFilePath());
       } else {
         fprintf(stderr, "Inspection of crashed process failed\n");
       }
 
       // Now that we're done reading messages, cleanup the service, but only
       // if there was an actual exception
       // Otherwise, it means the dump was generated on demand and the process
       // lives on, and we might be needed again in the future.
       if (exception_code_) {
         ServiceCheckOut(receive_port_name);
@@ skipping 258 matching lines @@
 #if VERBOSE
     PRINT_MACH_RESULT(result, "Inspector: sent acknowledgement");
 #endif
 
     return result;
   }
 
   return KERN_INVALID_NAME;
 }
 
-//=============================================================================
-void Inspector::LaunchReporter(const char *inConfigFilePath) {
-  // Extract the path to the reporter executable.
-  const char *reporterExecutablePath =
-          config_params_.GetValueForKey(BREAKPAD_REPORTER_EXE_LOCATION);
-
-  // Setup and launch the crash dump sender.
-  const char *argv[3];
-  argv[0] = reporterExecutablePath;
-  argv[1] = inConfigFilePath;
-  argv[2] = NULL;
-
-  // Launch the reporter
-  pid_t pid = fork();
-
-  // 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);
-    config_file_.Unlink();  // launch failed - get rid of config file
-    _exit(1);
-  }
-
-  // Wait until the Reporter child process exits.
-  //
-
-  // We'll use a timeout of one minute.
-  int timeoutCount = 60;   // 60 seconds
-
-  while (timeoutCount-- > 0) {
-    int status;
-    pid_t result = waitpid(pid, &status, WNOHANG);
-
-    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